typing of cpp_typecheckt::add_this_to_method_type

Author: Daniel Kroening

src/cpp/cpp_declarator_converter.cpp

@@ -105,7 +105,9 @@ symbolt &cpp_declarator_convertert::convert(
       // adjust type if it's a non-static member function
       if(final_type.id()==ID_code)
         cpp_typecheck.add_this_to_method_type(
-          scope->identifier, final_type, method_qualifier);
+          cpp_typecheck.lookup(scope->identifier),
+          to_code_type(final_type),
+          method_qualifier);
 
       get_final_identifier();
 

src/cpp/cpp_typecheck.h

@@ -402,8 +402,8 @@ class cpp_typecheckt:public c_typecheck_baset
     exprt &value);
 
   void add_this_to_method_type(
-    const irep_idt &compound_identifier,
-    typet &method_type,
+    const symbolt &compound_symbol,
+    code_typet &method_type,
     const typet &method_qualifier);
 
   // for function overloading

src/cpp/cpp_typecheck_compound_type.cpp

@@ -1283,10 +1283,7 @@ void cpp_typecheckt::typecheck_member_function(
   }
   else
   {
-    add_this_to_method_type(
-      compound_symbol.name,
-      type,
-      method_qualifier);
+    add_this_to_method_type(compound_symbol, type, method_qualifier);
   }
 
   if(value.id() == ID_cpp_not_typechecked && value.has_operands())
@@ -1344,11 +1341,11 @@ void cpp_typecheckt::typecheck_member_function(
 }
 
 void cpp_typecheckt::add_this_to_method_type(
-  const irep_idt &compound_symbol,
-  typet &type,
+  const symbolt &compound_symbol,
+  code_typet &type,
   const typet &method_qualifier)
 {
-  code_typet::parameterst &parameters=to_code_type(type).parameters();
+  code_typet::parameterst &parameters = type.parameters();
 
   parameters.insert(
     parameters.begin(), code_typet::parametert());
@@ -1359,7 +1356,7 @@ void cpp_typecheckt::add_this_to_method_type(
   parameter.set_base_name(ID_this);
   parameter.set_this();
 
-  typet subtype=symbol_typet(compound_symbol);
+  typet subtype = symbol_typet(compound_symbol.name);
 
   if(has_const(method_qualifier))
     subtype.set(ID_C_constant, true);