Merge pull request diffblue#2293 from tautschnig/c++-decltype-bit-field

Daniel Kroening · web-flow · commit e54bba2f8c43 · 2018-06-07T16:08:05.000+01:00
decltype(bit field type) is the underlying subtype
diff --git a/regression/cpp/Bit_fields1/test.desc b/regression/cpp/Bit_fields1/test.desc
@@ -1,4 +1,4 @@
-KNOWNBUG
+CORE
 main.cpp
 -std=c++11
 ^EXIT=0$
diff --git a/src/cpp/cpp_typecheck_type.cpp b/src/cpp/cpp_typecheck_type.cpp
@@ -227,7 +227,11 @@ void cpp_typecheckt::typecheck_type(typet &type)
   {
     exprt e=static_cast<const exprt &>(type.find(ID_expr_arg));
     typecheck_expr(e);
-    type=e.type();
+
+    if(e.type().id() == ID_c_bit_field)
+      type = e.type().subtype();
+    else
+      type = e.type();
   }
   else if(type.id()==ID_unassigned)
   {

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,11 @@ void cpp_typecheckt::typecheck_type(typet &type)`
`227`	`227`	`{`
`228`	`228`	`exprt e=static_cast<const exprt &>(type.find(ID_expr_arg));`
`229`	`229`	`typecheck_expr(e);`
`230`		`- type=e.type();`
	`230`	`+`
	`231`	`+ if(e.type().id() == ID_c_bit_field)`
	`232`	`+ type = e.type().subtype();`
	`233`	`+ else`
	`234`	`+ type = e.type();`
`231`	`235`	`}`
`232`	`236`	`else if(type.id()==ID_unassigned)`
`233`	`237`	`{`