Merge pull request #251 from diffblue/feature/revert-recording-symbol-table

Revert security-scanner version of recording symbol table

Author: smowton

src/analyses/is_threaded.cpp

@@ -85,7 +85,7 @@ class is_threaded_domaint:public ai_domain_baset
 void is_threadedt::compute(const goto_functionst &goto_functions)
 {
   // the analysis doesn't actually use the namespace, fake one
-  concrete_symbol_tablet symbol_table;
+  symbol_tablet symbol_table;
   const namespacet ns(symbol_table);
 
   ait<is_threaded_domaint> is_threaded_analysis;

src/ansi-c/ansi_c_language.cpp

@@ -106,7 +106,7 @@ bool ansi_c_languaget::typecheck(
   symbol_tablet &symbol_table,
   const std::string &module)
 {
-  concrete_symbol_tablet new_symbol_table;
+  symbol_tablet new_symbol_table;
 
   if(ansi_c_typecheck(
     parse_tree,

src/ansi-c/ansi_c_typecheck.cpp

@@ -42,7 +42,7 @@ bool ansi_c_typecheck(
   const unsigned errors_before=
     message_handler.get_message_count(messaget::M_ERROR);
 
-  concrete_symbol_tablet symbol_table;
+  symbol_tablet symbol_table;
   ansi_c_parse_treet ansi_c_parse_tree;
 
   ansi_c_typecheckt ansi_c_typecheck(

src/ansi-c/type2name.cpp

@@ -269,6 +269,6 @@ std::string type2name(const typet &type, const namespacet &ns)
 
 std::string type2name(const typet &type)
 {
-  concrete_symbol_tablet symbol_table;
+  symbol_tablet symbol_table;
   return type2name(type, namespacet(symbol_table));
 }

src/cbmc/bmc.h

@@ -68,7 +68,7 @@ class bmct:public safety_checkert
 
 protected:
   const optionst &options;
-  concrete_symbol_tablet new_symbol_table;
+  symbol_tablet new_symbol_table;
   namespacet ns;
   symex_target_equationt equation;
   symex_bmct symex;

src/cpp/cpp_language.cpp

@@ -126,7 +126,7 @@ bool cpp_languaget::typecheck(
   if(module=="")
     return false;
 
-  concrete_symbol_tablet new_symbol_table;
+  symbol_tablet new_symbol_table;
 
   if(cpp_typecheck(
       cpp_parse_tree, new_symbol_table, module, get_message_handler()))

src/cpp/cpp_typecheck.cpp

@@ -102,7 +102,7 @@ bool cpp_typecheck(
   const unsigned errors_before=
     message_handler.get_message_count(messaget::M_ERROR);
 
-  concrete_symbol_tablet symbol_table;
+  symbol_tablet symbol_table;
   cpp_parse_treet cpp_parse_tree;
 
   cpp_typecheckt cpp_typecheck(cpp_parse_tree, symbol_table,

src/goto-cc/linker_script_merge.cpp

@@ -53,7 +53,7 @@ int linker_script_merget::add_linker_script_definitions()
     return fail;
   }
 
-  concrete_symbol_tablet original_st;
+  symbol_tablet original_st;
   goto_functionst original_gf;
   fail=read_goto_binary(goto_file, original_st, original_gf,
       get_message_handler());

src/goto-instrument/dump_c.cpp

@@ -46,7 +46,7 @@ void dump_ct::operator()(std::ostream &os)
 
   // add copies of struct types when ID_C_transparent_union is only
   // annotated to parameter
-  concrete_symbol_tablet symbols_transparent;
+  symbol_tablet symbols_transparent;
   for(const auto &named_symbol : copied_symbol_table.symbols)
   {
     const symbolt &symbol=named_symbol.second;

src/goto-instrument/dump_c_class.h

@@ -48,7 +48,7 @@ class dump_ct
 
 protected:
   const goto_functionst &goto_functions;
-  concrete_symbol_tablet copied_symbol_table;
+  symbol_tablet copied_symbol_table;
   const namespacet ns;
   std::unique_ptr<languaget> language;
   const bool harness;