Read "is inlined" attribute of goto functions from the symbol table

There should only be a single place to hold type information, including
attributes, to ensure consistency. Future changes will remove the "type" member
of goto_functiont, making the type information stored in the symbol table the
single, authoritative source of information.

The "is inlined" information should already be consistent/redundant. This commit
makes all read accesses use the information stored in the symbol table, and also
uses a modern API for doing so.

Author: tautschnig

src/ansi-c/ansi_c_declaration.cpp

@@ -150,7 +150,7 @@ void ansi_c_declarationt::to_symbol(
     symbol.is_file_local=get_is_static();
 
     if(get_is_inline())
-      symbol.type.set(ID_C_inlined, true);
+      to_code_type(symbol.type).set_inlined(true);
 
     if(
       config.ansi_c.mode == configt::ansi_ct::flavourt::GCC ||

src/ansi-c/c_typecheck_base.cpp

@@ -309,10 +309,6 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
 
   if(final_new.id()==ID_code)
   {
-    bool inlined=
-       (new_symbol.type.get_bool(ID_C_inlined) ||
-        old_symbol.type.get_bool(ID_C_inlined));
-
     if(final_old.id()!=ID_code)
     {
       error().source_location=new_symbol.location;
@@ -327,15 +323,17 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
     code_typet &old_ct=to_code_type(old_symbol.type);
     code_typet &new_ct=to_code_type(new_symbol.type);
 
+    const bool inlined = old_ct.get_inlined() || new_ct.get_inlined();
+
     if(old_ct.has_ellipsis() && !new_ct.has_ellipsis())
       old_ct=new_ct;
     else if(!old_ct.has_ellipsis() && new_ct.has_ellipsis())
       new_ct=old_ct;
 
     if(inlined)
     {
-      old_symbol.type.set(ID_C_inlined, true);
-      new_symbol.type.set(ID_C_inlined, true);
+      old_ct.set_inlined(true);
+      new_ct.set_inlined(true);
     }
 
     // do body
@@ -348,7 +346,7 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
         // definition is marked as "extern inline"
 
         if(
-          old_symbol.type.get_bool(ID_C_inlined) &&
+          old_ct.get_inlined() &&
           (config.ansi_c.mode == configt::ansi_ct::flavourt::GCC ||
            config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG ||
            config.ansi_c.mode == configt::ansi_ct::flavourt::ARM ||

src/cpp/cpp_declarator_converter.cpp

@@ -462,7 +462,7 @@ symbolt &cpp_declarator_convertert::convert_new_symbol(
     symbol.is_macro=true;
 
   if(member_spec.is_inline())
-    symbol.type.set(ID_C_inlined, true);
+    to_code_type(symbol.type).set_inlined(true);
 
   if(!symbol.is_type)
   {

src/cpp/cpp_typecheck_compound_type.cpp

@@ -1293,7 +1293,7 @@ void cpp_typecheckt::typecheck_member_function(
   component.set(ID_prefix, id2string(identifier) + "::");
 
   if(value.is_not_nil())
-    type.set(ID_C_inlined, true);
+    to_code_type(type).set_inlined(true);
 
   symbol.name=identifier;
   symbol.base_name=component.get_base_name();

src/goto-analyzer/unreachable_instructions.cpp

@@ -173,9 +173,12 @@ void unreachable_instructions(
 
     // f_it->first may be a link-time renamed version, use the
     // base_name instead; do not list inlined functions
-    if(called.find(decl.base_name)!=called.end() ||
-       f_it->second.is_inlined())
+    if(
+      called.find(decl.base_name) != called.end() ||
+      to_code_type(decl.type).get_inlined())
+    {
       unreachable_instructions(goto_program, dead_map);
+    }
     else
       all_unreachable(goto_program, dead_map);
 
@@ -295,10 +298,12 @@ static void list_functions(
 
     // f_it->first may be a link-time renamed version, use the
     // base_name instead; do not list inlined functions
-    if(unreachable ==
-       (called.find(decl.base_name)!=called.end() ||
-        f_it->second.is_inlined()))
+    if(
+      unreachable == (called.find(decl.base_name) != called.end() ||
+                      to_code_type(decl.type).get_inlined()))
+    {
       continue;
+    }
 
     source_locationt first_location=decl.location;
 

src/goto-instrument/aggressive_slicer.cpp

@@ -39,9 +39,11 @@ void aggressive_slicert::note_functions_to_keep(
 
 void aggressive_slicert::get_all_functions_containing_properties()
 {
+  const namespacet ns(goto_model.symbol_table);
+
   for(const auto &fct : goto_model.goto_functions.function_map)
   {
-    if(!fct.second.is_inlined())
+    if(!to_code_type(ns.lookup(fct.first).type).get_inlined())
     {
       for(const auto &ins : fct.second.body.instructions)
         if(ins.is_assert())

src/goto-instrument/remove_function.cpp

@@ -39,7 +39,8 @@ void remove_function(
                     << " in goto program" << messaget::eom;
     return;
   }
-  else if(entry->second.is_inlined())
+  else if(to_code_type(goto_model.symbol_table.lookup_ref(identifier).type)
+            .get_inlined())
   {
     message.warning() << "Function " << identifier << " is inlined, "
                       << "instantiations will not be removed"

src/goto-programs/goto_inline.cpp

@@ -194,7 +194,7 @@ void goto_partial_inline(
         continue;
 
       if(
-        called_function.is_inlined() ||
+        to_code_type(ns.lookup(id).type).get_inlined() ||
         called_function.body.instructions.size() <= smallfunc_limit)
       {
         PRECONDITION(i_it->is_function_call());

src/goto-programs/link_goto_model.cpp

@@ -104,7 +104,7 @@ static bool link_functions(
       {
         // just keep the old one in dest
       }
-      else if(in_dest_symbol_table.type.get_bool(ID_C_inlined))
+      else if(to_code_type(ns.lookup(final_id).type).get_inlined())
       {
         // ok, we silently ignore
       }

src/goto-programs/property_checker.cpp

@@ -30,12 +30,15 @@ property_checkert::property_checkert(
 {
 }
 
-void property_checkert::initialize_property_map(
-  const goto_functionst &goto_functions)
+void property_checkert::initialize_property_map(const goto_modelt &goto_model)
 {
-  forall_goto_functions(it, goto_functions)
-    if(!it->second.is_inlined() ||
-       it->first==goto_functions.entry_point())
+  const namespacet ns(goto_model.symbol_table);
+
+  forall_goto_functions(it, goto_model.goto_functions)
+  {
+    if(
+      !to_code_type(ns.lookup(it->first).type).get_inlined() ||
+      it->first == goto_functionst::entry_point())
     {
       const goto_programt &goto_program=it->second.body;
 
@@ -53,4 +56,5 @@ void property_checkert::initialize_property_map(
         property_status.location=i_it;
       }
     }
+  }
 }