From e8c6bb74735360c22bdae320caaee5f5db7d6092 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 4 Apr 2011 09:02:50 +0200 Subject: [PATCH] re PR debug/48401 (ICE: RTL check: access of elt 4 of 'var_location' with last elt 2 in expand_gimple_basic_block, at cfgexpand.c:3585) PR debug/48404 * cfgexpand.c (expand_gimple_basic_block): Avoid useless assignment. Use PAT_VAR_LOCATION_LOC instead of INSN_VAR_LOCATION_LOC. From-SVN: r171924 --- gcc/ChangeLog | 6 ++++++ gcc/cfgexpand.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a0b099fd6bc..b33bde63421 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-04-04 Jakub Jelinek + + PR debug/48404 + * cfgexpand.c (expand_gimple_basic_block): Avoid useless assignment. + Use PAT_VAR_LOCATION_LOC instead of INSN_VAR_LOCATION_LOC. + 2011-04-03 Nathan Froyd * tree.h (struct tree_const_decl): Inherit from tree_decl_common. diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index cdd7d035615..81a23d4c8ab 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -3517,7 +3517,7 @@ expand_gimple_basic_block (basic_block bb) val = gen_rtx_VAR_LOCATION (mode, vexpr, (rtx)value, VAR_INIT_STATUS_INITIALIZED); - val = emit_debug_insn (val); + emit_debug_insn (val); FOR_EACH_IMM_USE_STMT (debugstmt, imm_iter, op) { @@ -3582,9 +3582,9 @@ expand_gimple_basic_block (basic_block bb) { /* We can't dump the insn with a TREE where an RTX is expected. */ - INSN_VAR_LOCATION_LOC (val) = const0_rtx; + PAT_VAR_LOCATION_LOC (val) = const0_rtx; maybe_dump_rtl_for_gimple_stmt (stmt, last); - INSN_VAR_LOCATION_LOC (val) = (rtx)value; + PAT_VAR_LOCATION_LOC (val) = (rtx)value; } /* In order not to generate too many debug temporaries, -- 2.30.2