Revert:

2007-07-06  Alexandre Oliva  <aoliva@redhat.com>
PR debug/23551
* tree-ssa-copyrename.c (copy_rename_partition_coalesce):
Disregard DECL_FROM_INLINE.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126492 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c30159..8b3152b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-09  Alexandre Oliva  <aoliva@oliva.athome.lsd.ic.unicamp.br>
+
+       Revert:
+       2007-07-06  Alexandre Oliva  <aoliva@redhat.com>
+       PR debug/23551
+       * tree-ssa-copyrename.c (copy_rename_partition_coalesce):
+       Disregard DECL_FROM_INLINE.
+

 2007-07-09  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/27855
 2007-07-09  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/27855

diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index c0945d4..812ebe1 100644 (file)
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -191,12 +191,20 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
   ign1 = TREE_CODE (root1) == VAR_DECL && DECL_IGNORED_P (root1);
   ign2 = TREE_CODE (root2) == VAR_DECL && DECL_IGNORED_P (root2);
 
   ign1 = TREE_CODE (root1) == VAR_DECL && DECL_IGNORED_P (root1);
   ign2 = TREE_CODE (root2) == VAR_DECL && DECL_IGNORED_P (root2);
 

-  /* Never attempt to coalesce 2 user variables.  */
+  /* Never attempt to coalesce 2 user variables unless one is an inline 
+     variable.  */

   if (!ign1 && !ign2)
     {
   if (!ign1 && !ign2)
     {

-      if (debug)
-       fprintf (debug, " : 2 different USER vars. No coalesce.\n");
-      return false;
+      if (DECL_FROM_INLINE (root2))
+        ign2 = true;
+      else if (DECL_FROM_INLINE (root1))
+       ign1 = true;
+      else 
+       {
+         if (debug)
+           fprintf (debug, " : 2 different USER vars. No coalesce.\n");
+         return false;
+       }

     }
 
   /* Don't coalesce if there are two different memory tags.  */
     }
 
   /* Don't coalesce if there are two different memory tags.  */