diff --git a/regression/acceleration/array_unsafe1/test.desc b/regression/acceleration/array_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/array_unsafe1/test.desc +++ b/regression/acceleration/array_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/array_unsafe2/test.desc b/regression/acceleration/array_unsafe2/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/array_unsafe2/test.desc +++ b/regression/acceleration/array_unsafe2/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/array_unsafe3/test.desc b/regression/acceleration/array_unsafe3/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/array_unsafe3/test.desc +++ b/regression/acceleration/array_unsafe3/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/array_unsafe4/test.desc b/regression/acceleration/array_unsafe4/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/array_unsafe4/test.desc +++ b/regression/acceleration/array_unsafe4/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/const_unsafe1/test.desc b/regression/acceleration/const_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/const_unsafe1/test.desc +++ b/regression/acceleration/const_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/diamond_unsafe1/test.desc b/regression/acceleration/diamond_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/diamond_unsafe1/test.desc +++ b/regression/acceleration/diamond_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/diamond_unsafe2/test.desc b/regression/acceleration/diamond_unsafe2/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/diamond_unsafe2/test.desc +++ b/regression/acceleration/diamond_unsafe2/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/functions_unsafe1/test.desc b/regression/acceleration/functions_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/functions_unsafe1/test.desc +++ b/regression/acceleration/functions_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/multivar_unsafe1/test.desc b/regression/acceleration/multivar_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/multivar_unsafe1/test.desc +++ b/regression/acceleration/multivar_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/nested_unsafe1/test.desc b/regression/acceleration/nested_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/nested_unsafe1/test.desc +++ b/regression/acceleration/nested_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/overflow_unsafe1/test.desc b/regression/acceleration/overflow_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/overflow_unsafe1/test.desc +++ b/regression/acceleration/overflow_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/phases_unsafe1/test.desc b/regression/acceleration/phases_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/phases_unsafe1/test.desc +++ b/regression/acceleration/phases_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/simple_unsafe1/test.desc b/regression/acceleration/simple_unsafe1/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/simple_unsafe1/test.desc +++ b/regression/acceleration/simple_unsafe1/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/simple_unsafe2/test.desc b/regression/acceleration/simple_unsafe2/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/simple_unsafe2/test.desc +++ b/regression/acceleration/simple_unsafe2/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/simple_unsafe3/test.desc b/regression/acceleration/simple_unsafe3/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/simple_unsafe3/test.desc +++ b/regression/acceleration/simple_unsafe3/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/acceleration/simple_unsafe4/test.desc b/regression/acceleration/simple_unsafe4/test.desc index 200554d997b..e6fe08aeb20 100644 --- a/regression/acceleration/simple_unsafe4/test.desc +++ b/regression/acceleration/simple_unsafe4/test.desc @@ -1,7 +1,6 @@ CORE main.c --no-unwinding-assertions - ^EXIT=10$ ^SIGNAL=0$ ^VERIFICATION FAILED$ diff --git a/regression/ansi-c/static_inline1/test.desc b/regression/ansi-c/static_inline1/test.desc index 5717777037a..52168c7eba4 100644 --- a/regression/ansi-c/static_inline1/test.desc +++ b/regression/ansi-c/static_inline1/test.desc @@ -4,6 +4,5 @@ main.c ^EXIT=0$ ^SIGNAL=0$ ^VERIFICATION SUCCESSFUL$ - -- ^warning: ignoring diff --git a/regression/ansi-c/static_inline2/test.desc b/regression/ansi-c/static_inline2/test.desc index c5c5692745d..6a006f47021 100644 --- a/regression/ansi-c/static_inline2/test.desc +++ b/regression/ansi-c/static_inline2/test.desc @@ -4,6 +4,5 @@ main.c ^EXIT=0$ ^SIGNAL=0$ ^VERIFICATION SUCCESSFUL$ - -- ^warning: ignoring diff --git a/regression/cbmc-incr-oneloop/unwind-forever1/test.desc b/regression/cbmc-incr-oneloop/unwind-forever1/test.desc index 617547e56ad..5d03502707e 100644 --- a/regression/cbmc-incr-oneloop/unwind-forever1/test.desc +++ b/regression/cbmc-incr-oneloop/unwind-forever1/test.desc @@ -3,6 +3,5 @@ main.c --incremental-check main.0 ^EXIT=142$ ^SIGNAL=0$ - -- ^warning: ignoring diff --git a/regression/cbmc-incr-oneloop/unwind-forever2/test.desc b/regression/cbmc-incr-oneloop/unwind-forever2/test.desc index bff68c7e0c8..920f3890da5 100644 --- a/regression/cbmc-incr-oneloop/unwind-forever2/test.desc +++ b/regression/cbmc-incr-oneloop/unwind-forever2/test.desc @@ -3,6 +3,5 @@ main.c --incremental-check main.0 ^EXIT=142$ ^SIGNAL=0$ - -- ^warning: ignoring diff --git a/regression/cbmc-java/tableswitch2/test.desc b/regression/cbmc-java/tableswitch2/test.desc index b9e08d5d49b..baee77bb8e9 100644 --- a/regression/cbmc-java/tableswitch2/test.desc +++ b/regression/cbmc-java/tableswitch2/test.desc @@ -1,7 +1,6 @@ CORE table_switch_neg_offset.class --function table_switch_neg_offset.f - ^EXIT=0$ ^SIGNAL=0$ ^VERIFICATION SUCCESSFUL$ diff --git a/regression/cpp-linter/function-comment-header1/test.desc b/regression/cpp-linter/function-comment-header1/test.desc index efaae0b7391..708eecf0783 100644 --- a/regression/cpp-linter/function-comment-header1/test.desc +++ b/regression/cpp-linter/function-comment-header1/test.desc @@ -3,6 +3,5 @@ main.cpp ^main\.cpp:26: Could not find function header comment for foo \[readability/function_comment\] \[4\] ^Total errors found: 1$ - ^SIGNAL=0$ -- diff --git a/regression/cpp-linter/struct-inline-decl/test.desc b/regression/cpp-linter/struct-inline-decl/test.desc index 4a53c26c870..12418d892f4 100644 --- a/regression/cpp-linter/struct-inline-decl/test.desc +++ b/regression/cpp-linter/struct-inline-decl/test.desc @@ -1,7 +1,6 @@ CORE main.cpp - ^Total errors found: 0$ ^EXIT=0$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/approx-array-variable-const-fp/test.desc b/regression/goto-analyzer/approx-array-variable-const-fp/test.desc index 83a930d1c36..38027f70600 100644 --- a/regression/goto-analyzer/approx-array-variable-const-fp/test.desc +++ b/regression/goto-analyzer/approx-array-variable-const-fp/test.desc @@ -1,17 +1,16 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f2 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f3 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f4 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f2 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f3 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f4 THEN GOTO [0-9]$ ^SIGNAL=0$ -- -^\s*IF fp_tbl\[\(signed long int\)i\] == f1 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f5 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f6 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f7 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f8 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f9 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f1 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f5 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f6 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f7 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f8 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f9 THEN GOTO [0-9]$ ^warning: ignoring diff --git a/regression/goto-analyzer/approx-const-fp-array-variable-cast-const-fp/test.desc b/regression/goto-analyzer/approx-const-fp-array-variable-cast-const-fp/test.desc index a937e306d31..e6f1f4b5752 100644 --- a/regression/goto-analyzer/approx-const-fp-array-variable-cast-const-fp/test.desc +++ b/regression/goto-analyzer/approx-const-fp-array-variable-cast-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f2 THEN GOTO [0-9]$ ^\s*IF fp == f3 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/approx-const-fp-array-variable-const-fp-with-null/test.desc b/regression/goto-analyzer/approx-const-fp-array-variable-const-fp-with-null/test.desc index a937e306d31..e6f1f4b5752 100644 --- a/regression/goto-analyzer/approx-const-fp-array-variable-const-fp-with-null/test.desc +++ b/regression/goto-analyzer/approx-const-fp-array-variable-const-fp-with-null/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f2 THEN GOTO [0-9]$ ^\s*IF fp == f3 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/approx-const-fp-array-variable-const-fp/test.desc b/regression/goto-analyzer/approx-const-fp-array-variable-const-fp/test.desc index a937e306d31..e6f1f4b5752 100644 --- a/regression/goto-analyzer/approx-const-fp-array-variable-const-fp/test.desc +++ b/regression/goto-analyzer/approx-const-fp-array-variable-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f2 THEN GOTO [0-9]$ ^\s*IF fp == f3 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/approx-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc b/regression/goto-analyzer/approx-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc index a937e306d31..e6f1f4b5752 100644 --- a/regression/goto-analyzer/approx-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc +++ b/regression/goto-analyzer/approx-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f2 THEN GOTO [0-9]$ ^\s*IF fp == f3 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/approx-const-fp-array-variable-const-struct-non-const-fp/test.desc b/regression/goto-analyzer/approx-const-fp-array-variable-const-struct-non-const-fp/test.desc index a937e306d31..e6f1f4b5752 100644 --- a/regression/goto-analyzer/approx-const-fp-array-variable-const-struct-non-const-fp/test.desc +++ b/regression/goto-analyzer/approx-const-fp-array-variable-const-struct-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f2 THEN GOTO [0-9]$ ^\s*IF fp == f3 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/approx-const-fp-array-variable-invalid-cast-const-fp/test.desc b/regression/goto-analyzer/approx-const-fp-array-variable-invalid-cast-const-fp/test.desc index 6df2697851a..661ac93a14f 100644 --- a/regression/goto-analyzer/approx-const-fp-array-variable-invalid-cast-const-fp/test.desc +++ b/regression/goto-analyzer/approx-const-fp-array-variable-invalid-cast-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == \(const void_fp\)f2 THEN GOTO [0-9]$ ^\s*IF fp == \(const void_fp\)f3 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-array-const-pointer-const-fp-const-lost/test.desc b/regression/goto-analyzer/no-match-const-array-const-pointer-const-fp-const-lost/test.desc index 9ac0520abde..cb389930278 100644 --- a/regression/goto-analyzer/no-match-const-array-const-pointer-const-fp-const-lost/test.desc +++ b/regression/goto-analyzer/no-match-const-array-const-pointer-const-fp-const-lost/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF \*fp == f1 THEN GOTO [0-9]$ ^\s*IF \*fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-array-literal-const-fp-run-time/test.desc b/regression/goto-analyzer/no-match-const-fp-array-literal-const-fp-run-time/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-const-fp-array-literal-const-fp-run-time/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-array-literal-const-fp-run-time/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp-run-time/test.desc b/regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp-run-time/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp-run-time/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp-run-time/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp/test.desc b/regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp/test.desc index 9c0926c2e7a..13d0c5353ce 100644 --- a/regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp2 == f1 THEN GOTO [0-9]$ ^\s*IF fp2 == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-array-non-const-fp/test.desc b/regression/goto-analyzer/no-match-const-fp-array-non-const-fp/test.desc index 9c0926c2e7a..13d0c5353ce 100644 --- a/regression/goto-analyzer/no-match-const-fp-array-non-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-array-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp2 == f1 THEN GOTO [0-9]$ ^\s*IF fp2 == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-binary-op-const-lost/test.desc b/regression/goto-analyzer/no-match-const-fp-binary-op-const-lost/test.desc index e8357d911c6..b9a72f79cfe 100644 --- a/regression/goto-analyzer/no-match-const-fp-binary-op-const-lost/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-binary-op-const-lost/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-const-array-index-lost/test.desc b/regression/goto-analyzer/no-match-const-fp-const-array-index-lost/test.desc index 9ac0520abde..cb389930278 100644 --- a/regression/goto-analyzer/no-match-const-fp-const-array-index-lost/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-const-array-index-lost/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF \*fp == f1 THEN GOTO [0-9]$ ^\s*IF \*fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-const-array-lost/test.desc b/regression/goto-analyzer/no-match-const-fp-const-array-lost/test.desc index 9ac0520abde..cb389930278 100644 --- a/regression/goto-analyzer/no-match-const-fp-const-array-lost/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-const-array-lost/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF \*fp == f1 THEN GOTO [0-9]$ ^\s*IF \*fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-const-cast/test.desc b/regression/goto-analyzer/no-match-const-fp-const-cast/test.desc index e8357d911c6..b9a72f79cfe 100644 --- a/regression/goto-analyzer/no-match-const-fp-const-cast/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-const-cast/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-const-lost/test.desc b/regression/goto-analyzer/no-match-const-fp-const-lost/test.desc index e8357d911c6..b9a72f79cfe 100644 --- a/regression/goto-analyzer/no-match-const-fp-const-lost/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-const-lost/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-const-pointer-const-struct-const-fp-null/test.desc b/regression/goto-analyzer/no-match-const-fp-const-pointer-const-struct-const-fp-null/test.desc index 25b505c0a0f..4786993cade 100644 --- a/regression/goto-analyzer/no-match-const-fp-const-pointer-const-struct-const-fp-null/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-const-pointer-const-struct-const-fp-null/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*ASSERT FALSE // invalid function pointer$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/no-match-const-fp-const-pointer-non-const-struct-const-fp/test.desc b/regression/goto-analyzer/no-match-const-fp-const-pointer-non-const-struct-const-fp/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-const-fp-const-pointer-non-const-struct-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-const-pointer-non-const-struct-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-dereference-const-pointer-null/test.desc b/regression/goto-analyzer/no-match-const-fp-dereference-const-pointer-null/test.desc index 25b505c0a0f..4786993cade 100644 --- a/regression/goto-analyzer/no-match-const-fp-dereference-const-pointer-null/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-dereference-const-pointer-null/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*ASSERT FALSE // invalid function pointer$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/no-match-const-fp-dereference-non-const-pointer-const-fp/test.desc b/regression/goto-analyzer/no-match-const-fp-dereference-non-const-pointer-const-fp/test.desc index 61a7ec29e6b..f7f42277bae 100644 --- a/regression/goto-analyzer/no-match-const-fp-dereference-non-const-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-dereference-non-const-pointer-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF final_fp == f1 THEN GOTO [0-9]$ ^\s*IF final_fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-dynamic-array-non-const-fp/test.desc b/regression/goto-analyzer/no-match-const-fp-dynamic-array-non-const-fp/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-const-fp-dynamic-array-non-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-dynamic-array-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-non-const-pointer-non-const-struct-const-fp/test.desc b/regression/goto-analyzer/no-match-const-fp-non-const-pointer-non-const-struct-const-fp/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-const-fp-non-const-pointer-non-const-struct-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-non-const-pointer-non-const-struct-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-non-const-struct-const-fp/test.desc b/regression/goto-analyzer/no-match-const-fp-non-const-struct-const-fp/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-const-fp-non-const-struct-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-non-const-struct-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-non-const-struct-non-const-fp/test.desc b/regression/goto-analyzer/no-match-const-fp-non-const-struct-non-const-fp/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-const-fp-non-const-struct-non-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-non-const-struct-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-fp-null/test.desc b/regression/goto-analyzer/no-match-const-fp-null/test.desc index 267ec2284f7..d8e8d833238 100644 --- a/regression/goto-analyzer/no-match-const-fp-null/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-null/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*ASSERT FALSE // invalid function pointer$ -- diff --git a/regression/goto-analyzer/no-match-const-fp-ternerary-op-const-lost/test.desc b/regression/goto-analyzer/no-match-const-fp-ternerary-op-const-lost/test.desc index e8357d911c6..b9a72f79cfe 100644 --- a/regression/goto-analyzer/no-match-const-fp-ternerary-op-const-lost/test.desc +++ b/regression/goto-analyzer/no-match-const-fp-ternerary-op-const-lost/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-pointer-const-struct-const-fp-const-cast/test.desc b/regression/goto-analyzer/no-match-const-pointer-const-struct-const-fp-const-cast/test.desc index 2f4b2832b4d..4e6fda43498 100644 --- a/regression/goto-analyzer/no-match-const-pointer-const-struct-const-fp-const-cast/test.desc +++ b/regression/goto-analyzer/no-match-const-pointer-const-struct-const-fp-const-cast/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF container_pointer->fp == f1 THEN GOTO [0-9]$ ^\s*IF container_pointer->fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-pointer-non-const-struct-const-fp/test.desc b/regression/goto-analyzer/no-match-const-pointer-non-const-struct-const-fp/test.desc index 2760fadd576..eaad08aafe0 100644 --- a/regression/goto-analyzer/no-match-const-pointer-non-const-struct-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-const-pointer-non-const-struct-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF pts->go == f1 THEN GOTO [0-9]$ ^\s*IF pts->go == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-const-struct-non-const-fp-null/test.desc b/regression/goto-analyzer/no-match-const-struct-non-const-fp-null/test.desc index 25b505c0a0f..4786993cade 100644 --- a/regression/goto-analyzer/no-match-const-struct-non-const-fp-null/test.desc +++ b/regression/goto-analyzer/no-match-const-struct-non-const-fp-null/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*ASSERT FALSE // invalid function pointer$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/no-match-dereference-const-pointer-const-array-literal-pointer-const-fp/test.desc b/regression/goto-analyzer/no-match-dereference-const-pointer-const-array-literal-pointer-const-fp/test.desc index 7e0aca75523..ef491f67113 100644 --- a/regression/goto-analyzer/no-match-dereference-const-pointer-const-array-literal-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-dereference-const-pointer-const-array-literal-pointer-const-fp/test.desc @@ -1,17 +1,16 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f1 THEN GOTO [0-9]$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f2 THEN GOTO [0-9]$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f3 THEN GOTO [0-9]$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f4 THEN GOTO [0-9]$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f5 THEN GOTO [0-9]$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f6 THEN GOTO [0-9]$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f7 THEN GOTO [0-9]$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f8 THEN GOTO [0-9]$ -^\s*IF \*container_ptr->fp_tbl\[\(signed long int\)1\] == f9 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f1 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f2 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f3 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f4 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f5 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f6 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f7 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f8 THEN GOTO [0-9]$ +^\s*IF \*container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f9 THEN GOTO [0-9]$ ^SIGNAL=0$ -- ^warning: ignoring diff --git a/regression/goto-analyzer/no-match-dereference-non-const-struct-const-pointer-const-fp/test.desc b/regression/goto-analyzer/no-match-dereference-non-const-struct-const-pointer-const-fp/test.desc index f55defde97b..662bd323844 100644 --- a/regression/goto-analyzer/no-match-dereference-non-const-struct-const-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-dereference-non-const-struct-const-pointer-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF \*container_container\.container == f1 THEN GOTO [0-9]$ ^\s*IF \*container_container\.container == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-dereference-non-const-struct-non-const-pointer-const-fp/test.desc b/regression/goto-analyzer/no-match-dereference-non-const-struct-non-const-pointer-const-fp/test.desc index f55defde97b..662bd323844 100644 --- a/regression/goto-analyzer/no-match-dereference-non-const-struct-non-const-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-dereference-non-const-struct-non-const-pointer-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF \*container_container\.container == f1 THEN GOTO [0-9]$ ^\s*IF \*container_container\.container == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-non-const-fp/test.desc b/regression/goto-analyzer/no-match-non-const-fp/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-non-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-parameter-const-fp/test.desc b/regression/goto-analyzer/no-match-parameter-const-fp/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-parameter-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-parameter-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-parameter-fp/test.desc b/regression/goto-analyzer/no-match-parameter-fp/test.desc index 997ec886207..a73805f5730 100644 --- a/regression/goto-analyzer/no-match-parameter-fp/test.desc +++ b/regression/goto-analyzer/no-match-parameter-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ diff --git a/regression/goto-analyzer/no-match-pointer-const-struct-array-literal-non-const-fp/test.desc b/regression/goto-analyzer/no-match-pointer-const-struct-array-literal-non-const-fp/test.desc index 83a4d98d9f4..a85714b51a1 100644 --- a/regression/goto-analyzer/no-match-pointer-const-struct-array-literal-non-const-fp/test.desc +++ b/regression/goto-analyzer/no-match-pointer-const-struct-array-literal-non-const-fp/test.desc @@ -1,17 +1,16 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f1 THEN GOTO [0-9]$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f2 THEN GOTO [0-9]$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f3 THEN GOTO [0-9]$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f4 THEN GOTO [0-9]$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f5 THEN GOTO [0-9]$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f6 THEN GOTO [0-9]$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f7 THEN GOTO [0-9]$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f8 THEN GOTO [0-9]$ -^\s*IF container_ptr->fp_tbl\[\(signed long int\)1\] == f9 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f1 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f2 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f3 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f4 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f5 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f6 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f7 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f8 THEN GOTO [0-9]$ +^\s*IF container_ptr->fp_tbl\[\(signed (long )*long int\)1\] == f9 THEN GOTO [0-9]$ ^SIGNAL=0$ -- ^warning: ignoring diff --git a/regression/goto-analyzer/precise-const-fp-array-literal-const-fp-run-time/test.desc b/regression/goto-analyzer/precise-const-fp-array-literal-const-fp-run-time/test.desc index 6c7de56a1a0..ab2a0acefba 100644 --- a/regression/goto-analyzer/precise-const-fp-array-literal-const-fp-run-time/test.desc +++ b/regression/goto-analyzer/precise-const-fp-array-literal-const-fp-run-time/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ -- diff --git a/regression/goto-analyzer/precise-const-fp-array-literal-const-struct-non-const-fp/test.desc b/regression/goto-analyzer/precise-const-fp-array-literal-const-struct-non-const-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-const-fp-array-literal-const-struct-non-const-fp/test.desc +++ b/regression/goto-analyzer/precise-const-fp-array-literal-const-struct-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc b/regression/goto-analyzer/precise-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc index eb1e2781ef1..90cd2485ce1 100644 --- a/regression/goto-analyzer/precise-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc +++ b/regression/goto-analyzer/precise-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f2\(\); ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-const-fp-const-struct-const-array-literal-fp/test.desc b/regression/goto-analyzer/precise-const-fp-const-struct-const-array-literal-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-const-fp-const-struct-const-array-literal-fp/test.desc +++ b/regression/goto-analyzer/precise-const-fp-const-struct-const-array-literal-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-const-fp-const-struct-non-const-array-literal-fp/test.desc b/regression/goto-analyzer/precise-const-fp-const-struct-non-const-array-literal-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-const-fp-const-struct-non-const-array-literal-fp/test.desc +++ b/regression/goto-analyzer/precise-const-fp-const-struct-non-const-array-literal-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-const-fp-const-struct-non-const-fp/test.desc b/regression/goto-analyzer/precise-const-fp-const-struct-non-const-fp/test.desc index eb1e2781ef1..90cd2485ce1 100644 --- a/regression/goto-analyzer/precise-const-fp-const-struct-non-const-fp/test.desc +++ b/regression/goto-analyzer/precise-const-fp-const-struct-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f2\(\); ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-const-fp-dereference-const-pointer-const-fp/test.desc b/regression/goto-analyzer/precise-const-fp-dereference-const-pointer-const-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-const-fp-dereference-const-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/precise-const-fp-dereference-const-pointer-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-const-fp/test.desc b/regression/goto-analyzer/precise-const-fp/test.desc index ef4cf690b60..4dd6e7fd098 100644 --- a/regression/goto-analyzer/precise-const-fp/test.desc +++ b/regression/goto-analyzer/precise-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f2\(\); -- diff --git a/regression/goto-analyzer/precise-const-pointer-const-struct-fp/test.desc b/regression/goto-analyzer/precise-const-pointer-const-struct-fp/test.desc index 0de6942ba42..40361f6ccc2 100644 --- a/regression/goto-analyzer/precise-const-pointer-const-struct-fp/test.desc +++ b/regression/goto-analyzer/precise-const-pointer-const-struct-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f2\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-const-struct-non-const-fp/test.desc b/regression/goto-analyzer/precise-const-struct-non-const-fp/test.desc index eb1e2781ef1..90cd2485ce1 100644 --- a/regression/goto-analyzer/precise-const-struct-non-const-fp/test.desc +++ b/regression/goto-analyzer/precise-const-struct-non-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f2\(\); ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-derefence-const-pointer-const-fp/test.desc b/regression/goto-analyzer/precise-derefence-const-pointer-const-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-derefence-const-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/precise-derefence-const-pointer-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-derefence/test.desc b/regression/goto-analyzer/precise-derefence/test.desc index ef4cf690b60..4dd6e7fd098 100644 --- a/regression/goto-analyzer/precise-derefence/test.desc +++ b/regression/goto-analyzer/precise-derefence/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f2\(\); -- diff --git a/regression/goto-analyzer/precise-dereference-address-pointer-const-fp/test.desc b/regression/goto-analyzer/precise-dereference-address-pointer-const-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-dereference-address-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/precise-dereference-address-pointer-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-dereference-const-struct-const-pointer-const-fp/test.desc b/regression/goto-analyzer/precise-dereference-const-struct-const-pointer-const-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-dereference-const-struct-const-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/precise-dereference-const-struct-const-pointer-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-dereference-const-struct-const-pointer-const-struct-const-fp/test.desc b/regression/goto-analyzer/precise-dereference-const-struct-const-pointer-const-struct-const-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-dereference-const-struct-const-pointer-const-struct-const-fp/test.desc +++ b/regression/goto-analyzer/precise-dereference-const-struct-const-pointer-const-struct-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-analyzer/precise-dereference-const-struct-pointer-const-fp/test.desc b/regression/goto-analyzer/precise-dereference-const-struct-pointer-const-fp/test.desc index 2eff811f4bc..fad0e6c7a1d 100644 --- a/regression/goto-analyzer/precise-dereference-const-struct-pointer-const-fp/test.desc +++ b/regression/goto-analyzer/precise-dereference-const-struct-pointer-const-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --show-goto-functions --verbosity 10 --pointer-check - ^Removing function pointers and virtual functions$ ^\s*f3\(\);$ ^SIGNAL=0$ diff --git a/regression/goto-instrument/approx-array-variable-const-fp-only-remove-const/test.desc b/regression/goto-instrument/approx-array-variable-const-fp-only-remove-const/test.desc index f58b03a58b3..bc553fa5a0f 100644 --- a/regression/goto-instrument/approx-array-variable-const-fp-only-remove-const/test.desc +++ b/regression/goto-instrument/approx-array-variable-const-fp-only-remove-const/test.desc @@ -1,16 +1,15 @@ CORE main.c --verbosity 10 --pointer-check --remove-const-function-pointers - -^\s*IF fp_tbl\[\(signed long int\)i\] == f2 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f3 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f4 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f2 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f3 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f4 THEN GOTO [0-9]$ ^SIGNAL=0$ -- -^\s*IF fp_tbl\[\(signed long int\)i\] == f1 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f5 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f6 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f7 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f8 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f9 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f1 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f5 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f6 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f7 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f8 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f9 THEN GOTO [0-9]$ ^warning: ignoring diff --git a/regression/goto-instrument/approx-array-variable-const-fp-remove-all-fp/test.desc b/regression/goto-instrument/approx-array-variable-const-fp-remove-all-fp/test.desc index 3d065f1a742..e9ede02a296 100644 --- a/regression/goto-instrument/approx-array-variable-const-fp-remove-all-fp/test.desc +++ b/regression/goto-instrument/approx-array-variable-const-fp-remove-all-fp/test.desc @@ -1,16 +1,15 @@ CORE main.c --verbosity 10 --pointer-check --remove-function-pointers - -^\s*IF fp_tbl\[\(signed long int\)i\] == f2 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f3 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f4 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f2 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f3 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f4 THEN GOTO [0-9]$ ^SIGNAL=0$ -- -^\s*IF fp_tbl\[\(signed long int\)i\] == f1 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f5 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f6 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f7 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f8 THEN GOTO [0-9]$ -^\s*IF fp_tbl\[\(signed long int\)i\] == f9 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f1 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f5 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f6 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f7 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f8 THEN GOTO [0-9]$ +^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f9 THEN GOTO [0-9]$ ^warning: ignoring diff --git a/regression/goto-instrument/no-match-non-const-fp-only-remove-const/test.desc b/regression/goto-instrument/no-match-non-const-fp-only-remove-const/test.desc index 3b016907a44..9c23726e83c 100644 --- a/regression/goto-instrument/no-match-non-const-fp-only-remove-const/test.desc +++ b/regression/goto-instrument/no-match-non-const-fp-only-remove-const/test.desc @@ -1,7 +1,6 @@ CORE main.c --verbosity 10 --pointer-check --remove-const-function-pointers - ^\s*fp\(\);$ ^SIGNAL=0$ -- diff --git a/regression/goto-instrument/no-match-non-const-fp-remove-all-fp/test.desc b/regression/goto-instrument/no-match-non-const-fp-remove-all-fp/test.desc index 3190d348aae..46c2f8cd2d4 100644 --- a/regression/goto-instrument/no-match-non-const-fp-remove-all-fp/test.desc +++ b/regression/goto-instrument/no-match-non-const-fp-remove-all-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --verbosity 10 --pointer-check --remove-function-pointers - ^\s*IF fp == f1 THEN GOTO [0-9]$ ^\s*IF fp == f2 THEN GOTO [0-9]$ ^\s*IF fp == f3 THEN GOTO [0-9]$ diff --git a/regression/goto-instrument/precise-const-fp-only-remove-const/test.desc b/regression/goto-instrument/precise-const-fp-only-remove-const/test.desc index 2304d56b239..cdf49005c0b 100644 --- a/regression/goto-instrument/precise-const-fp-only-remove-const/test.desc +++ b/regression/goto-instrument/precise-const-fp-only-remove-const/test.desc @@ -1,7 +1,6 @@ CORE main.c --verbosity 10 --pointer-check --remove-const-function-pointers - ^\s*f2\(\); -- ^warning: ignoring diff --git a/regression/goto-instrument/precise-const-fp-remove-all-fp/test.desc b/regression/goto-instrument/precise-const-fp-remove-all-fp/test.desc index dd072b1c232..a559b2b1747 100644 --- a/regression/goto-instrument/precise-const-fp-remove-all-fp/test.desc +++ b/regression/goto-instrument/precise-const-fp-remove-all-fp/test.desc @@ -1,7 +1,6 @@ CORE main.c --verbosity 10 --pointer-check --remove-function-pointers - ^\s*f2\(\); -- ^warning: ignoring