[depends: #708] Adding tests that check that simplify removes statements generated by FP removal

regression/goto-analyze-show-goto-functions/Makefile

@@ -0,0 +1,31 @@
+
+default: tests.log
+
+test:
+	@if ! ../test.pl -c ../chain.sh ; then \
+		../failed-tests-printer.pl ; \
+		exit 1; \
+	fi
+
+tests.log:
+	@if ! ../test.pl -c ../chain.sh ; then \
+		../failed-tests-printer.pl ; \
+		exit 1; \
+	fi
+
+show:
+	@for dir in *; do \
+		if [ -d "$$dir" ]; then \
+			vim -o "$$dir/*.c" "$$dir/*.out"; \
+		fi; \
+	done;
+
+clean:
+	@for dir in *; do \
+		rm -f tests.log; \
+		if [ -d "$$dir" ]; then \
+			cd "$$dir"; \
+			rm -f *.out *.gb; \
+			cd ..; \
+		fi \
+	done

regression/goto-analyze-show-goto-functions/chain.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+SRC=../../../src
+GA=$SRC/goto-analyzer/goto-analyzer
+
+if [ -a $1_simplified.gb ]
+  then
+    rm $1_simplified.gb
+fi
+$GA $1 --simplify $1_simplified.gb --variable --arrays --structs --pointers
+$GA $1_simplified.gb --show-goto-functions

regression/goto-analyze-show-goto-functions/simplify-fp-const-lost/main.c

@@ -0,0 +1,35 @@
+#include <stdio.h>
+
+void f1 (void) { printf("%i\n", 1); }
+void f2 (void) { printf("%i\n", 2); }
+void f3 (void) { printf("%i\n", 3); }
+void f4 (void) { printf("%i\n", 4); }
+void f5 (void) { printf("%i\n", 5); }
+void f6 (void) { printf("%i\n", 6); }
+void f7 (void) { printf("%i\n", 7); }
+void f8 (void) { printf("%i\n", 8); }
+void f9 (void) { printf("%i\n", 9); }
+
+typedef void(*void_fp)(void);
+
+// There is a basic check that excludes all functions that aren't used anywhere
+// This ensures that check can't work in this example
+const void_fp fp_all[] = {f1, f2 ,f3, f4, f5 ,f6, f7, f8, f9};
+
+void func()
+{
+  const void_fp fp = f2;
+
+  // Warning: this loses const-ness of f2
+  void_fp * p2fp = (void_fp*)&fp;
+  *p2fp = &f4;
+
+  fp();
+}
+
+int main()
+{
+  func();
+
+  return 0;
+}

regression/goto-analyze-show-goto-functions/simplify-fp-const-lost/test.desc

@@ -0,0 +1,18 @@
+CORE
+main.c
+
+^\s*f4\(\);$
+^SIGNAL=0$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the simplified goto program doesn't call any of the other functions (i.e
+it has simplified all the unused cases generated by function pointer removal)

regression/goto-analyze-show-goto-functions/simplify-fp-dynamic-array-fp/main.c

@@ -0,0 +1,36 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+void f1 (void) { printf("%i\n", 1); }
+void f2 (void) { printf("%i\n", 2); }
+void f3 (void) { printf("%i\n", 3); }
+void f4 (void) { printf("%i\n", 4); }
+void f5 (void) { printf("%i\n", 5); }
+void f6 (void) { printf("%i\n", 6); }
+void f7 (void) { printf("%i\n", 7); }
+void f8 (void) { printf("%i\n", 8); }
+void f9 (void) { printf("%i\n", 9); }
+
+typedef void(*void_fp)(void);
+
+// There is a basic check that excludes all functions that aren't used anywhere
+// This ensures that check can't work in this example
+const void_fp fp_all[] = {f1, f2 ,f3, f4, f5 ,f6, f7, f8, f9};
+
+void func()
+{
+  void_fp * const fp_tbl= malloc(sizeof(void_fp) * 3);
+  fp_tbl[0]=f2;
+  fp_tbl[1]=f3;
+  fp_tbl[2]=f4;
+
+  const void_fp fp = fp_tbl[1];
+  fp();
+}
+
+int main()
+{
+  func();
+
+  return 0;
+}

regression/goto-analyze-show-goto-functions/simplify-fp-dynamic-array-fp/test.desc

@@ -0,0 +1,18 @@
+FUTURE
+main.c
+
+^\s*f3\(\);$
+^SIGNAL=0$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step. This requires supporting tracking arrays assigned dynamically

regression/goto-analyze-show-goto-functions/simplify-fp-fp-param/main.c

@@ -0,0 +1,29 @@
+#include <stdio.h>
+
+void f1 (void) { printf("%i\n", 1); }
+void f2 (void) { printf("%i\n", 2); }
+void f3 (void) { printf("%i\n", 3); }
+void f4 (void) { printf("%i\n", 4); }
+void f5 (void) { printf("%i\n", 5); }
+void f6 (void) { printf("%i\n", 6); }
+void f7 (void) { printf("%i\n", 7); }
+void f8 (void) { printf("%i\n", 8); }
+void f9 (void) { printf("%i\n", 9); }
+
+typedef void(*void_fp)(void);
+
+// There is a basic check that excludes all functions that aren't used anywhere
+// This ensures that check can't work in this example
+const void_fp fp_all[] = {f1, f2 ,f3, f4, f5 ,f6, f7, f8, f9};
+
+void func(void_fp fp)
+{
+  fp();
+}
+
+int main(int argc, char** argv)
+{
+
+  func(&f2);
+  return 0;
+}

regression/goto-analyze-show-goto-functions/simplify-fp-fp-param/test.desc

@@ -0,0 +1,18 @@
+CORE
+main.c
+
+^SIGNAL=0$
+^\s*f2\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step.

regression/goto-analyze-show-goto-functions/simplify-fp-modified-array-pointer-fp/main.c

@@ -0,0 +1,41 @@
+#include <stdio.h>
+
+void f1 (void) { printf("%i\n", 1); }
+void f2 (void) { printf("%i\n", 2); }
+void f3 (void) { printf("%i\n", 3); }
+void f4 (void) { printf("%i\n", 4); }
+void f5 (void) { printf("%i\n", 5); }
+void f6 (void) { printf("%i\n", 6); }
+void f7 (void) { printf("%i\n", 7); }
+void f8 (void) { printf("%i\n", 8); }
+void f9 (void) { printf("%i\n", 9); }
+
+typedef void(*void_fp)(void);
+
+// There is a basic check that excludes all functions that aren't used anywhere
+// This ensures that check can't work in this example
+const void_fp fp_all[] = {f1, f2 ,f3, f4, f5 ,f6, f7, f8, f9};
+
+void func()
+{
+  const void_fp start_fp = f2;
+  const void_fp * const fp_tbl[] = { &start_fp, &start_fp, &start_fp };
+
+  // warning: loses const
+  void_fp * arr_ptr=fp_tbl[0];
+  (*arr_ptr) = f5;
+  arr_ptr++;
+  (*arr_ptr) = f5;
+
+  const void_fp * const fp = fp_tbl[1];
+
+
+  (*fp)();
+}
+
+int main()
+{
+  func();
+
+  return 0;
+}

regression/goto-analyze-show-goto-functions/simplify-fp-modified-array-pointer-fp/test.desc

@@ -0,0 +1,18 @@
+FUTURE
+main.c
+
+^SIGNAL=0$
+^\s*f5\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step

regression/goto-analyze-show-goto-functions/simplify-fp-modified-array/main.c

@@ -0,0 +1,39 @@
+#include <stdio.h>
+
+void f1 (void) { printf("%i\n", 1); }
+void f2 (void) { printf("%i\n", 2); }
+void f3 (void) { printf("%i\n", 3); }
+void f4 (void) { printf("%i\n", 4); }
+void f5 (void) { printf("%i\n", 5); }
+void f6 (void) { printf("%i\n", 6); }
+void f7 (void) { printf("%i\n", 7); }
+void f8 (void) { printf("%i\n", 8); }
+void f9 (void) { printf("%i\n", 9); }
+
+typedef void(*void_fp)(void);
+
+// There is a basic check that excludes all functions that aren't used anywhere
+// This ensures that check can't work in this example
+const void_fp fp_all[] = {f1, f2 ,f3, f4, f5 ,f6, f7, f8, f9};
+
+void func()
+{
+  const void_fp fp_tbl[] = {f2, f3 ,f4};
+
+  // warning: loses const
+  void_fp * arr_ptr=&fp_tbl[0];
+  (*arr_ptr) = f5;
+  arr_ptr++;
+  (*arr_ptr) = f5;
+
+  const void_fp fp = &fp_tbl[1];
+
+  fp();
+}
+
+int main()
+{
+  func();
+
+  return 0;
+}

regression/goto-analyze-show-goto-functions/simplify-fp-modified-array/test.desc

@@ -0,0 +1,18 @@
+FUTURE
+main.c
+
+^SIGNAL=0$
+^\s*f5\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step

regression/goto-analyze-show-goto-functions/simplify-fp-non-const-pointer/main.c

@@ -0,0 +1,31 @@
+#include <stdio.h>
+
+void f1 (void) { printf("%i\n", 1); }
+void f2 (void) { printf("%i\n", 2); }
+void f3 (void) { printf("%i\n", 3); }
+void f4 (void) { printf("%i\n", 4); }
+void f5 (void) { printf("%i\n", 5); }
+void f6 (void) { printf("%i\n", 6); }
+void f7 (void) { printf("%i\n", 7); }
+void f8 (void) { printf("%i\n", 8); }
+void f9 (void) { printf("%i\n", 9); }
+
+typedef void(*void_fp)(void);
+
+// There is a basic check that excludes all functions that aren't used anywhere
+// This ensures that check can't work in this example
+const void_fp fp_all[] = {f1, f2 ,f3, f4, f5 ,f6, f7, f8, f9};
+
+void func()
+{
+  void_fp fp = f2;
+  fp = f3;
+  fp();
+}
+
+int main()
+{
+  func();
+
+  return 0;
+}

regression/goto-analyze-show-goto-functions/simplify-fp-non-const-pointer/test.desc

@@ -0,0 +1,18 @@
+CORE
+main.c
+
+^SIGNAL=0$
+^\s*f3\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step