From: Per Bothner <per@bothner.com>
Date: Fri, 22 Apr 2005 19:01:29 +0000 (-0700)
Subject: decl.c (make_rtl_for_nonlocal_decl): Don't try get_fileinfo if input_filename is... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f12b095b1916f35ed89eaffdb5b0ac0e4074e8d;p=gcc.git

decl.c (make_rtl_for_nonlocal_decl): Don't try get_fileinfo if input_filename is NULL...


	* decl.c (make_rtl_for_nonlocal_decl): Don't try get_fileinfo if
        input_filename is NULL, as it is for (say) __PRETTY_FUNCTION__.

From-SVN: r98582
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 30eb8662ea3..14a787ba7e6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-22  Per Bothner  <per@bothner.com>
+
+	* decl.c (make_rtl_for_nonlocal_decl): Don't try get_fileinfo if
+        input_filename is NULL, as it is for (say) __PRETTY_FUNCTION__.
+
 2005-04-22  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR c++/21087
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2a3c30cd71d..5d52a2600f5 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4543,6 +4543,7 @@ make_rtl_for_nonlocal_decl (tree decl, tree init, const char* asmspec)
 {
   int toplev = toplevel_bindings_p ();
   int defer_p;
+  const char *filename;
 
   /* Set the DECL_ASSEMBLER_NAME for the object.  */
   if (asmspec)
@@ -4592,17 +4593,19 @@ make_rtl_for_nonlocal_decl (tree decl, tree init, const char* asmspec)
 
   /* We try to defer namespace-scope static constants so that they are
      not emitted into the object file unnecessarily.  */
+  filename = input_filename;
   if (!DECL_VIRTUAL_P (decl)
       && TREE_READONLY (decl)
       && DECL_INITIAL (decl) != NULL_TREE
       && DECL_INITIAL (decl) != error_mark_node
+      && filename != NULL
       && ! EMPTY_CONSTRUCTOR_P (DECL_INITIAL (decl))
       && toplev
       && !TREE_PUBLIC (decl))
     {
       /* Fool with the linkage of static consts according to #pragma
 	 interface.  */
-      struct c_fileinfo *finfo = get_fileinfo (lbasename (input_filename));
+      struct c_fileinfo *finfo = get_fileinfo (lbasename (filename));
       if (!finfo->interface_unknown && !TREE_PUBLIC (decl))
 	{
 	  TREE_PUBLIC (decl) = 1;