Merge pull request #6367 from diffblue/crangler

Crangler

Author: tautschnig

CMakeLists.txt

@@ -150,6 +150,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
               "$<TARGET_FILE:unit>"
               "$<TARGET_FILE:goto-harness>"
               "$<TARGET_FILE:cbmc>"
+              "$<TARGET_FILE:crangler>"
               "$<TARGET_FILE:driver>"
               "$<TARGET_FILE:goto-analyzer>"
               "$<TARGET_FILE:goto-cc>"
@@ -213,6 +214,8 @@ cprover_default_properties(
     cbmc
     cbmc-lib
     cpp
+    crangler
+    crangler-lib
     driver
     goto-analyzer
     goto-analyzer-lib

regression/CMakeLists.txt

@@ -83,3 +83,7 @@ if(WITH_MEMORY_ANALYZER)
   add_subdirectory(memory-analyzer)
   add_subdirectory(extract_type_header)
 endif()
+
+if(NOT WIN32)
+  add_subdirectory(crangler)
+endif()

regression/Makefile

@@ -3,6 +3,7 @@
 # listed with decreasing runtimes (i.e. longest running at the top)
 DIRS = cbmc \
        cbmc-library \
+       crangler \
        goto-analyzer \
        ansi-c \
        goto-instrument \

regression/crangler/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_test_pl_tests(
+    "$<TARGET_FILE:crangler>"
+)

regression/crangler/Makefile

@@ -0,0 +1,27 @@
+default: tests.log
+
+include ../../src/config.inc
+include ../../src/common
+
+ifeq ($(BUILD_ENV_),MSVC)
+test:
+
+tests.log:
+
+else
+test:
+	@../test.pl -e -p -c '../../../src/crangler/crangler'
+
+tests.log:
+	@../test.pl -e -p -c '../../../src/crangler/crangler'
+endif
+
+clean:
+	@for dir in *; do \
+		$(RM) tests.log; \
+		if [ -d "$$dir" ]; then \
+			cd "$$dir"; \
+			$(RM) *.out *.gb; \
+			cd ..; \
+		fi \
+	done

regression/crangler/remove-static-object/remove_static1.c

@@ -0,0 +1,16 @@
+int foo()
+{
+  return 0;
+}
+
+int bar();
+
+static void foobar1()
+{
+}
+
+void static foobar2()
+{
+}
+
+static short x;

regression/crangler/remove-static-object/remove_static1.desc

@@ -0,0 +1,8 @@
+CORE
+remove_static1.json
+
+^\s+void foobar1\(\)$
+^\s+short x;$
+^EXIT=0$
+^SIGNAL=0$
+--

regression/crangler/remove-static-object/remove_static1.json

@@ -0,0 +1,20 @@
+{
+  "sources": [
+    "remove_static1.c"
+  ],
+  "functions": [
+    {
+      "foobar1": [
+        "remove static"
+      ]
+    }
+  ],
+  "objects": [
+    {
+      "x": [
+        "remove static"
+      ]
+    }
+  ],
+  "output": "stdout"
+}

regression/crangler/remove-static-regex/remove_static1.c

@@ -0,0 +1,14 @@
+int foo()
+{
+  return 0;
+}
+
+int bar();
+
+static void foobar1()
+{
+}
+
+void static foobar2()
+{
+}

regression/crangler/remove-static-regex/remove_static1.desc

@@ -0,0 +1,8 @@
+CORE
+remove_static1.json
+
+^\s+void foobar1\(\)$
+^void\s+foobar2\(\)$
+^EXIT=0$
+^SIGNAL=0$
+--