Merge pull request #474 from thk123/bug/const-struct-symbols

Keep track of qualifiers for structs and unions

Author: peterschrammel

regression/goto-instrument/const-struct1/test.desc

@@ -1,7 +1,7 @@
-KNOWNBUG
+CORE
 main.c
 --show-symbol-table
-^Type\.*: struct struct_tag_name$
+^Type\.*: const struct struct_tag_name$
 ^Type\.*: const double$
 ^EXIT=0$
 ^SIGNAL=0$

regression/goto-instrument/const-struct2/main.c

@@ -0,0 +1,10 @@
+
+int main()
+{
+  const struct struct_tag_name {
+  int x;
+  float y;
+  } my_struct_var = {.x =  1, .y = 3.15};
+  const double z = 4;
+  return 0;
+}

regression/goto-instrument/const-struct2/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--show-symbol-table
+^Type\.*: const struct struct_tag_name$
+^Type\.*: const double$
+^EXIT=0$
+^SIGNAL=0$
+--
+^warning: ignoring

regression/goto-instrument/const-struct3/main.c

@@ -0,0 +1,13 @@
+
+struct struct_tag_name
+{
+	int x;
+	float y;
+};
+
+int main()
+{
+  const struct struct_tag_name my_struct_var = {.x =  1, .y = 3.15};
+  const double z = 4;
+  return 0;
+}

regression/goto-instrument/const-struct3/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--dump-c
+^\s*const struct struct_tag_name my_struct_var
+^\s*const double z
+^EXIT=0$
+^SIGNAL=0$
+--
+^warning: ignoring

regression/goto-instrument/const-union1/main.c

@@ -0,0 +1,13 @@
+
+union union_tag_name
+{
+	int x;
+	float y;
+};
+
+int main()
+{
+  const union union_tag_name my_union_var = {.y = 3.15};
+  const double z = 4;
+  return 0;
+}

regression/goto-instrument/const-union1/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--show-symbol-table
+^Type\.*: const union union_tag_name$
+^Type\.*: const double$
+^EXIT=0$
+^SIGNAL=0$
+--
+^warning: ignoring

regression/goto-instrument/volatile-struct1/main.c

@@ -0,0 +1,13 @@
+
+struct struct_tag_name
+{
+	int x;
+	float y;
+};
+
+int main()
+{
+  volatile struct struct_tag_name my_struct_var = {.x =  1, .y = 3.15};
+  const double z = 4;
+  return 0;
+}

regression/goto-instrument/volatile-struct1/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--show-symbol-table
+^Type\.*: volatile struct struct_tag_name$
+^Type\.*: const double$
+^EXIT=0$
+^SIGNAL=0$
+--
+^warning: ignoring

src/ansi-c/c_typecheck_type.cpp

@@ -819,7 +819,9 @@ void c_typecheck_baset::typecheck_compound_type(struct_union_typet &type)
   symbol_type.add_source_location()=type.source_location();
   symbol_type.set_identifier(identifier);
 
+  c_qualifierst original_qualifiers(type);
   type.swap(symbol_type);
+  original_qualifiers.write(type);
 }
 
 /*******************************************************************\