re PR bootstrap/54837 (lto bootstrap error: ICE in expand_debug_source_expr, at cfgex...

2012-10-09  Richard Guenther  <rguenther@suse.de>

	PR middle-end/54837
	* cfgexpand.c (expand_debug_source_expr): Move checking
	code conditional on a found decl_debug_args vector.

From-SVN: r192255

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c32e666f5c665189ebafe2bb6c5e44c4fdaec33c..655f85fa10b90abb4da6acc83b709c846d497652 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-09  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/54837
+       * cfgexpand.c (expand_debug_source_expr): Move checking
+       code conditional on a found decl_debug_args vector.
+
 2012-10-09  Richard Guenther  <rguenther@suse.de>
 
        * tree-streamer.c (streamer_tree_cache_get): Move ...

diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 299150e8ee23c6517c1596067c44cf464419b785..57589adbc883a15e0c10a2bbd2caec5c82049901 100644 (file)
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -3521,22 +3521,13 @@ expand_debug_source_expr (tree exp)
            && !DECL_INCOMING_RTL (exp)
            && DECL_ABSTRACT_ORIGIN (current_function_decl))
          {
-           tree aexp = exp;
-           if (DECL_ABSTRACT_ORIGIN (exp))
-             aexp = DECL_ABSTRACT_ORIGIN (exp);
+           tree aexp = DECL_ORIGIN (exp);
            if (DECL_CONTEXT (aexp)
                == DECL_ABSTRACT_ORIGIN (current_function_decl))
              {
                VEC(tree, gc) **debug_args;
                unsigned int ix;
                tree ddecl;
-#ifdef ENABLE_CHECKING
-               tree parm;
-               for (parm = DECL_ARGUMENTS (current_function_decl);
-                    parm; parm = DECL_CHAIN (parm))
-                 gcc_assert (parm != exp
-                             && DECL_ABSTRACT_ORIGIN (parm) != aexp);
-#endif
                debug_args = decl_debug_args_lookup (current_function_decl);
                if (debug_args != NULL)
                  {