slicc: work around improper initialization of a global in slicc.

3 files changed, 9 insertions, 5 deletions

diff --git a/src/mem/slicc/ast/Location.cc b/src/mem/slicc/ast/Location.cc
index 6209ccdb7..23d1dba0f 100644
--- a/src/mem/slicc/ast/Location.cc
+++ b/src/mem/slicc/ast/Location.cc
@@ -39,11 +39,15 @@
 #include "mem/slicc/ast/Location.hh"
 
 int g_line_number = 0;
-string g_file_name("");
+string &g_file_name()
+{
+    static string the_string;
+    return the_string;
+}
 
 Location::Location()
 {
-  m_file_name = g_file_name;
+  m_file_name = g_file_name();
   m_line_number = g_line_number;
 
   ostringstream sstr;
diff --git a/src/mem/slicc/ast/Location.hh b/src/mem/slicc/ast/Location.hh
index f070efc46..3233bdb3b 100644
--- a/src/mem/slicc/ast/Location.hh
+++ b/src/mem/slicc/ast/Location.hh
@@ -42,7 +42,7 @@
 #include "mem/slicc/slicc_global.hh"
 
 extern int g_line_number;
-extern string g_file_name;
+extern string &g_file_name();
 
 class Location {
 public:
diff --git a/src/mem/slicc/parser/parser.yy b/src/mem/slicc/parser/parser.yy
index 8090b88f7..724184665 100644
--- a/src/mem/slicc/parser/parser.yy
+++ b/src/mem/slicc/parser/parser.yy
@@ -337,7 +337,7 @@ DeclListAST* parse(string filename)
     exit(1);
   }
   g_line_number = 1;
-  g_file_name = filename;
+  g_file_name() = filename;
   yyin = file;
   g_decl_list_ptr = NULL;
   yyparse();
@@ -346,7 +346,7 @@ DeclListAST* parse(string filename)
 
 extern "C" void yyerror(char* s)
 {
-  fprintf(stderr, "%s:%d: %s at %s\n", g_file_name.c_str(), g_line_number, s, yytext);
+  fprintf(stderr, "%s:%d: %s at %s\n", g_file_name().c_str(), g_line_number, s, yytext);
   exit(1);
 }