Fix location of show-symbol-table

Author: NathanJPhillips

src/driver/sec_driver_parse_options.cpp

@@ -148,13 +148,30 @@ int sec_driver_parse_optionst::doit()
   status() << "Generating GOTO Program" << messaget::eom;
   lazy_goto_model.load_all_functions();
 
+  // Show the symbol table before process_goto_functions mangles return
+  // values, etc
+  if(cmdline.isset("show-symbol-table"))
+  {
+    ::show_symbol_table(lazy_goto_model.symbol_table, get_ui());
+    return 6;
+  }
+
   std::unique_ptr<goto_modelt> maybe_goto_model =
     lazy_goto_modelt::process_whole_model_and_freeze(
       std::move(lazy_goto_model));
   if(maybe_goto_model == nullptr)
     return 6;
   goto_modelt &goto_model = *maybe_goto_model;
 
+  // show it?
+  if(cmdline.isset("show-goto-functions"))
+  {
+    namespacet ns(goto_model.symbol_table);
+
+    goto_model.goto_functions.output(ns, std::cout);
+    return 6;
+  }
+
   if (cmdline.isset("security-scanner"))
   {
     return taint_do_security_scan(
@@ -378,22 +395,6 @@ bool sec_driver_parse_optionst::process_goto_functions(
 
     // recalculate numbers, etc.
     goto_model.goto_functions.update();
-
-    // show it?
-    if(cmdline.isset("show-goto-functions"))
-    {
-      namespacet ns(goto_model.symbol_table);
-
-      goto_model.goto_functions.output(ns, std::cout);
-      return true;
-    }
-
-    // show it?
-    if(cmdline.isset("show-symbol-table"))
-    {
-      ::show_symbol_table(goto_model, get_ui());
-      return true;
-    }
   }
 
   catch(const char *e)