Skip to content

Commit d84744f

Browse files
authored
Merge pull request #7848 from tautschnig/bugfixes/c++-bitfields
C++ front-end: fix type checking of anonymous bit fields
2 parents fa1d719 + be2a41c commit d84744f

File tree

137 files changed

+133
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+133
-191
lines changed

regression/ansi-c/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
77
"$<TARGET_FILE:goto-cc>"
88
)
99

10-
# In MacOS, a change in the assert.h header file
11-
# is causing template errors when exercising the
12-
# C++ front end (because of a transitive include
13-
# of <type_traits>) for files that include the
14-
# <assert.h> or <cassert> headers.
1510
add_test_pl_profile(
1611
"ansi-c-c++-front-end"
1712
"$<TARGET_FILE:goto-cc> -xc++ -D_Bool=bool"
18-
"-C;-I;test-c++-front-end;-s;c++-front-end-X;macos-assert-broken"
13+
"-C;-I;test-c++-front-end;-s;c++-front-end"
1914
"CORE"
2015
)
2116
else()

regression/ansi-c/Makefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ endif
1111

1212
ifeq ($(BUILD_ENV_),MSVC)
1313
excluded_tests = -X gcc-only -X clang-only
14-
else
15-
ifeq ($(BUILD_ENV_),OSX)
16-
# In MacOS, a change in the assert.h header file
17-
# is causing template errors when exercising the
18-
# C++ front end (because of a transitive include
19-
# of <type_traits>) for files that include the
20-
# <assert.h> or <cassert> headers.
21-
excluded_tests = -X macos-assert-broken
22-
endif
2314
endif
2415

2516
test:

regression/ansi-c/array_initialization2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE test-c++-front-end macos-assert-broken
1+
CORE test-c++-front-end
22
main.c
33

44
^EXIT=0$

regression/ansi-c/float_constant2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE test-c++-front-end macos-assert-broken
1+
CORE test-c++-front-end
22
main.c
33

44
^EXIT=0$

regression/ansi-c/goto_convert_switch_range_case_valid/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE test-c++-front-end macos-assert-broken
1+
CORE test-c++-front-end
22
main.c
33

44
^EXIT=0$

regression/cbmc-cpp/Address_of_Method1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG macos-assert-broken
1+
KNOWNBUG
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Anonymous_members1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Assignment1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ else()
44
set(gcc_only "")
55
endif()
66

7-
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
8-
set(exclude_mac_broken_tests -X macos-assert-broken)
9-
else()
10-
set(exclude_mac_broken_tests "")
11-
endif()
12-
137
add_test_pl_tests(
14-
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation" ${gcc_only} ${exclude_mac_broken_tests}
8+
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation" ${gcc_only}
159
)

regression/cbmc-cpp/Class_Members1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Comma_Operator1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/ConditionalExpression1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/ConditionalExpression2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor12/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor13/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor3/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor4/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor5/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor6/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Constructor9/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Conversion5/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Conversion6/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Conversion_Operator2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Conversion_Operator3/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Conversion_Operator4/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Default_Arguments1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Default_Arguments2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Destructor_with_PtrMember/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Float1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Friend5/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/FunctionParam1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Function_Arguments2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Function_Arguments5/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Function_Pointer1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Implicit_Conversion1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Implicit_Conversion4/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Implicit_Conversion6/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Implicit_Conversion7/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Inheritance1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Inheritance3/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Inheritance4/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Initializer1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Label0/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Linking1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33
module.cpp
44
^EXIT=0$

regression/cbmc-cpp/Makefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ include ../../src/common
55

66
ifeq ($(BUILD_ENV_),MSVC)
77
excluded_tests = -X gcc-only
8-
else
9-
ifeq ($(BUILD_ENV_),OSX)
10-
# In MacOS, a change in the assert.h header file
11-
# is causing template errors when exercising the
12-
# C++ front end (because of a transitive include
13-
# of <type_traits>) for files that include the
14-
# <assert.h> or <cassert> headers.
15-
excluded_tests = -X macos-assert-broken
16-
endif
178
endif
189

1910
test:

regression/cbmc-cpp/Member_Access_in_Class/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/MethodParam1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
instance is SATISFIABLE$

regression/cbmc-cpp/Mutable1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Functions1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Functions3/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Increment1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Members1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Operators12/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Operators13/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Operators2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Operators7/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG macos-assert-broken
1+
KNOWNBUG
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Overloading_Operators8/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

regression/cbmc-cpp/Pointer_Conversion2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORE macos-assert-broken
1+
CORE
22
main.cpp
33

44
^EXIT=0$

0 commit comments

Comments
 (0)