From 7b575cfaf349678f46f47ab92098fdcb68506dd4 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 9 Oct 2012 14:40:01 +0000 Subject: [PATCH] re PR bootstrap/54837 (lto bootstrap error: ICE in expand_debug_source_expr, at cfgexpand.c:3538) 2012-10-09 Richard Guenther PR middle-end/54837 * cfgexpand.c (expand_debug_source_expr): Move checking code conditional on a found decl_debug_args vector. From-SVN: r192255 --- gcc/ChangeLog | 6 ++++++ gcc/cfgexpand.c | 11 +---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c32e666f5c6..655f85fa10b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-10-09 Richard Guenther + + 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 * tree-streamer.c (streamer_tree_cache_get): Move ... diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 299150e8ee2..57589adbc88 100644 --- 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) {