Merge pull request #2306 from tautschnig/c++-qualifiers

Do not lose method qualifiers

Author: kroening

regression/cpp/Template_Specialisation2/test.desc

@@ -1,4 +1,4 @@
-KNOWNBUG
+CORE
 main.ii
 
 ^EXIT=0$

src/cpp/cpp_typecheck_type.cpp

@@ -78,6 +78,8 @@ void cpp_typecheckt::typecheck_type(typet &type)
   }
   else if(type.id()==ID_pointer)
   {
+    c_qualifierst qualifiers(type);
+
     // the pointer/reference might have a qualifier,
     // but do subtype first
     typecheck_type(type.subtype());
@@ -114,6 +116,11 @@ void cpp_typecheckt::typecheck_type(typet &type)
         }
       }
     }
+
+    if(type.get_bool(ID_C_constant))
+      qualifiers.is_constant = true;
+
+    qualifiers.write(type);
   }
   else if(type.id()==ID_array)
   {

src/cpp/parse.cpp

@@ -5222,7 +5222,13 @@ bool Parser::rTypeName(typet &tname)
   if(!rDeclarator(declarator, kCastDeclarator, false, false))
     return false;
 
-  tname.swap(declarator.type());
+  if(!declarator.method_qualifier().id().empty())
+  {
+    tname.swap(declarator.method_qualifier());
+    merge_types(declarator.type(), tname);
+  }
+  else
+    tname.swap(declarator.type());
 
   // make type_name subtype of arg
   make_subtype(type_name, tname);