genattrtab.c (attr_rtx_1): Hash SYMBOL_REFs.

gcc/
	* genattrtab.c (attr_rtx_1): Hash SYMBOL_REFs.
	(attr_string): Use copy_md_ptr_loc.

From-SVN: r178387

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afb213b586b3d09cb0c302861e981f73dd7d53c8..8f403140820db118eb8d5985e64fe5ee3802af8d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-31  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * genattrtab.c (attr_rtx_1): Hash SYMBOL_REFs.
+       (attr_string): Use copy_md_ptr_loc.
+
 2011-08-31  Martin Jambor  <mjambor@suse.cz>
 
        PR middle-end/49886

diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index a3da97868a99d5ae4efe9119d16295e492891fd7..69e08506fe5edf0b18abd6f310a3e95387e6c17e 100644 (file)
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -434,8 +434,9 @@ attr_rtx_1 (enum rtx_code code, va_list p)
          XEXP (rt_val, 1) = arg1;
        }
     }
-  else if (GET_RTX_LENGTH (code) == 1
-          && GET_RTX_FORMAT (code)[0] == 's')
+  else if (code == SYMBOL_REF
+          || (GET_RTX_LENGTH (code) == 1
+              && GET_RTX_FORMAT (code)[0] == 's'))
     {
       char *arg0 = va_arg (p, char *);
 
@@ -453,6 +454,11 @@ attr_rtx_1 (enum rtx_code code, va_list p)
          rtl_obstack = hash_obstack;
          rt_val = rtx_alloc (code);
          XSTR (rt_val, 0) = arg0;
+         if (code == SYMBOL_REF)
+           {
+             X0EXP (rt_val, 1) = NULL_RTX;
+             X0EXP (rt_val, 2) = NULL_RTX;
+           }
        }
     }
   else if (GET_RTX_LENGTH (code) == 2
@@ -611,6 +617,7 @@ attr_string (const char *str, int len)
   memcpy (new_str, str, len);
   new_str[len] = '\0';
   attr_hash_add_string (hashcode, new_str);
+  copy_md_ptr_loc (new_str, str);
 
   return new_str;                      /* Return the new string.  */
 }