fix 17799
Richard Henderson
rth@redhat.com
Sat Jan 1 01:45:00 GMT 2005
The only Necessary part of the patch is the one change to
use_register_for_decl. The rest is an audit of code that
was setting DECL_ARTIFICIAL but ought to have been seting
DECL_IGNORED_P as well.
Tested on i686-linux.
r~
PR middle-end/17799
* function.c (use_register_for_decl): Check DECL_IGNORED_P instead
of DECL_ARTIFICIAL.
(assign_parms_augmented_arg_list): Set DECL_IGNORED_P.
* c-decl.c (build_compound_literal): Likewise.
* dwarf2asm.c (dw2_force_const_mem): Likewise.
* gimplify.c (create_artificial_label): Likewise.
* tree-inline.c (expand_call_inline): Likewise.
* var-tracking.c (vt_initialize): Likewise.
* tree-outof-ssa.c (create_temp): Copy DECL_IGNORED_P.
cp/
* call.c (make_temporary_var_for_ref_to_temp): Set DECL_IGNORED_P.
* class.c (build_vtable): Don't conditionallize setting it
based on DWARF2_DEBUG.
(layout_class_type): Set DECL_IGNORED_P.
* decl2.c (get_guard): Likewise.
* rtti.c (get_tinfo_decl, build_lang_decl): Likewise.
* tree.c (build_local_temp): Likewise.
Index: c-decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-decl.c,v
retrieving revision 1.619
diff -u -p -r1.619 c-decl.c
--- c-decl.c 21 Dec 2004 17:06:25 -0000 1.619
+++ c-decl.c 1 Jan 2005 01:36:47 -0000
@@ -3479,6 +3479,7 @@ build_compound_literal (tree type, tree
DECL_DEFER_OUTPUT (decl) = 1;
DECL_COMDAT (decl) = 1;
DECL_ARTIFICIAL (decl) = 1;
+ DECL_IGNORED_P (decl) = 1;
pushdecl (decl);
rest_of_decl_compilation (decl, 1, 0);
}
Index: dwarf2asm.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/dwarf2asm.c,v
retrieving revision 1.40
diff -u -p -r1.40 dwarf2asm.c
--- dwarf2asm.c 19 Nov 2004 02:45:14 -0000 1.40
+++ dwarf2asm.c 1 Jan 2005 01:36:47 -0000
@@ -729,6 +729,7 @@ dw2_force_const_mem (rtx x)
id = get_identifier (ref_name);
decl = build_decl (VAR_DECL, id, ptr_type_node);
DECL_ARTIFICIAL (decl) = 1;
+ DECL_IGNORED_P (decl) = 1;
TREE_PUBLIC (decl) = 1;
DECL_INITIAL (decl) = decl;
make_decl_one_only (decl);
@@ -742,6 +743,7 @@ dw2_force_const_mem (rtx x)
id = get_identifier (label);
decl = build_decl (VAR_DECL, id, ptr_type_node);
DECL_ARTIFICIAL (decl) = 1;
+ DECL_IGNORED_P (decl) = 1;
TREE_STATIC (decl) = 1;
DECL_INITIAL (decl) = decl;
}
Index: function.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/function.c,v
retrieving revision 1.597
diff -u -p -r1.597 function.c
--- function.c 30 Dec 2004 03:07:36 -0000 1.597
+++ function.c 1 Jan 2005 01:36:48 -0000
@@ -1922,8 +1922,9 @@ use_register_for_decl (tree decl)
if (flag_float_store && FLOAT_TYPE_P (TREE_TYPE (decl)))
return false;
- /* Compiler-generated temporaries can always go in registers. */
- if (DECL_ARTIFICIAL (decl))
+ /* If we're not interested in tracking debugging information for
+ this decl, then we can certainly put it in a register. */
+ if (DECL_IGNORED_P (decl))
return true;
return (optimize || DECL_REGISTER (decl));
@@ -2105,6 +2106,7 @@ assign_parms_augmented_arg_list (struct
decl = build_decl (PARM_DECL, NULL_TREE, type);
DECL_ARG_TYPE (decl) = type;
DECL_ARTIFICIAL (decl) = 1;
+ DECL_IGNORED_P (decl) = 1;
TREE_CHAIN (decl) = fnargs;
fnargs = decl;
Index: gimplify.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gimplify.c,v
retrieving revision 2.100
diff -u -p -r2.100 gimplify.c
--- gimplify.c 29 Dec 2004 01:22:07 -0000 2.100
+++ gimplify.c 1 Jan 2005 01:36:48 -0000
@@ -293,6 +293,7 @@ create_artificial_label (void)
tree lab = build_decl (LABEL_DECL, NULL_TREE, void_type_node);
DECL_ARTIFICIAL (lab) = 1;
+ DECL_IGNORED_P (lab) = 1;
DECL_CONTEXT (lab) = current_function_decl;
return lab;
}
Index: tree-inline.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-inline.c,v
retrieving revision 1.160
diff -u -p -r1.160 tree-inline.c
--- tree-inline.c 23 Dec 2004 02:50:22 -0000 1.160
+++ tree-inline.c 1 Jan 2005 01:36:49 -0000
@@ -1569,6 +1569,7 @@ expand_call_inline (tree *tp, int *walk_
to the RET_LABEL. */
id->ret_label = build_decl (LABEL_DECL, NULL_TREE, NULL_TREE);
DECL_ARTIFICIAL (id->ret_label) = 1;
+ DECL_IGNORED_P (id->ret_label) = 1;
DECL_CONTEXT (id->ret_label) = VARRAY_TREE (id->fns, 0);
insert_decl_map (id, id->ret_label, id->ret_label);
Index: tree-outof-ssa.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-outof-ssa.c,v
retrieving revision 2.38
diff -u -p -r2.38 tree-outof-ssa.c
--- tree-outof-ssa.c 29 Dec 2004 19:21:07 -0000 2.38
+++ tree-outof-ssa.c 1 Jan 2005 01:36:49 -0000
@@ -162,6 +162,7 @@ create_temp (tree t)
else if (!DECL_IGNORED_P (t))
DECL_DEBUG_ALIAS_OF (tmp) = t;
DECL_ARTIFICIAL (tmp) = DECL_ARTIFICIAL (t);
+ DECL_IGNORED_P (tmp) = DECL_IGNORED_P (t);
add_referenced_tmp_var (tmp);
/* add_referenced_tmp_var will create the annotation and set up some
Index: var-tracking.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/var-tracking.c,v
retrieving revision 2.23
diff -u -p -r2.23 var-tracking.c
--- var-tracking.c 24 Dec 2004 05:23:10 -0000 2.23
+++ var-tracking.c 1 Jan 2005 01:36:49 -0000
@@ -2705,6 +2705,7 @@ vt_initialize (void)
DECL_NAME (frame_base_decl) = get_identifier ("___frame_base_decl");
TREE_TYPE (frame_base_decl) = char_type_node;
DECL_ARTIFICIAL (frame_base_decl) = 1;
+ DECL_IGNORED_P (frame_base_decl) = 1;
/* Set its initial "location". */
frame_stack_adjust = -prologue_stack_adjust ();
Index: cp/call.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/call.c,v
retrieving revision 1.525
diff -u -p -r1.525 call.c
--- cp/call.c 22 Dec 2004 18:00:38 -0000 1.525
+++ cp/call.c 1 Jan 2005 01:36:50 -0000
@@ -6373,6 +6373,7 @@ make_temporary_var_for_ref_to_temp (tree
/* Create the variable. */
var = build_decl (VAR_DECL, NULL_TREE, type);
DECL_ARTIFICIAL (var) = 1;
+ DECL_IGNORED_P (var) = 1;
TREE_USED (var) = 1;
/* Register the variable. */
Index: cp/class.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/class.c,v
retrieving revision 1.697
diff -u -p -r1.697 class.c
--- cp/class.c 20 Dec 2004 02:23:49 -0000 1.697
+++ cp/class.c 1 Jan 2005 01:36:51 -0000
@@ -659,28 +659,27 @@ build_vtable (tree class_type, tree name
DECL_EXTERNAL (decl) = 1;
DECL_NOT_REALLY_EXTERN (decl) = 1;
- if (write_symbols == DWARF2_DEBUG)
- /* Mark the VAR_DECL node representing the vtable itself as a
- "gratuitous" one, thereby forcing dwarfout.c to ignore it. It
- is rather important that such things be ignored because any
- effort to actually generate DWARF for them will run into
- trouble when/if we encounter code like:
+ /* Mark the VAR_DECL node representing the vtable itself as a
+ "gratuitous" one, thereby forcing dwarfout.c to ignore it. It
+ is rather important that such things be ignored because any
+ effort to actually generate DWARF for them will run into
+ trouble when/if we encounter code like:
- #pragma interface
- struct S { virtual void member (); };
+ #pragma interface
+ struct S { virtual void member (); };
- because the artificial declaration of the vtable itself (as
- manufactured by the g++ front end) will say that the vtable is
- a static member of `S' but only *after* the debug output for
- the definition of `S' has already been output. This causes
- grief because the DWARF entry for the definition of the vtable
- will try to refer back to an earlier *declaration* of the
- vtable as a static member of `S' and there won't be one. We
- might be able to arrange to have the "vtable static member"
- attached to the member list for `S' before the debug info for
- `S' get written (which would solve the problem) but that would
- require more intrusive changes to the g++ front end. */
- DECL_IGNORED_P (decl) = 1;
+ because the artificial declaration of the vtable itself (as
+ manufactured by the g++ front end) will say that the vtable is
+ a static member of `S' but only *after* the debug output for
+ the definition of `S' has already been output. This causes
+ grief because the DWARF entry for the definition of the vtable
+ will try to refer back to an earlier *declaration* of the
+ vtable as a static member of `S' and there won't be one. We
+ might be able to arrange to have the "vtable static member"
+ attached to the member list for `S' before the debug info for
+ `S' get written (which would solve the problem) but that would
+ require more intrusive changes to the g++ front end. */
+ DECL_IGNORED_P (decl) = 1;
return decl;
}
@@ -3529,13 +3528,13 @@ build_base_field (record_layout_info rli
/* Create the FIELD_DECL. */
decl = build_decl (FIELD_DECL, NULL_TREE, CLASSTYPE_AS_BASE (basetype));
DECL_ARTIFICIAL (decl) = 1;
+ DECL_IGNORED_P (decl) = 1;
DECL_FIELD_CONTEXT (decl) = t;
DECL_SIZE (decl) = CLASSTYPE_SIZE (basetype);
DECL_SIZE_UNIT (decl) = CLASSTYPE_SIZE_UNIT (basetype);
DECL_ALIGN (decl) = CLASSTYPE_ALIGN (basetype);
DECL_USER_ALIGN (decl) = CLASSTYPE_USER_ALIGN (basetype);
DECL_MODE (decl) = TYPE_MODE (basetype);
- DECL_IGNORED_P (decl) = 1;
DECL_FIELD_IS_BASE (decl) = 1;
/* Try to place the field. It may take more than one try if we
@@ -4697,6 +4696,7 @@ layout_class_type (tree t, tree *virtual
DECL_SIZE (padding_field) = padding;
DECL_CONTEXT (padding_field) = t;
DECL_ARTIFICIAL (padding_field) = 1;
+ DECL_IGNORED_P (padding_field) = 1;
layout_nonempty_base_or_field (rli, padding_field,
NULL_TREE,
empty_base_offsets);
Index: cp/decl2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/decl2.c,v
retrieving revision 1.762
diff -u -p -r1.762 decl2.c
--- cp/decl2.c 30 Dec 2004 23:29:32 -0000 1.762
+++ cp/decl2.c 1 Jan 2005 01:36:52 -0000
@@ -1998,6 +1998,7 @@ get_guard (tree decl)
DECL_WEAK (guard) = DECL_WEAK (decl);
DECL_ARTIFICIAL (guard) = 1;
+ DECL_IGNORED_P (guard) = 1;
TREE_USED (guard) = 1;
pushdecl_top_level_and_finish (guard, NULL_TREE);
}
Index: cp/init.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/init.c,v
retrieving revision 1.407
diff -u -p -r1.407 init.c
--- cp/init.c 17 Dec 2004 17:10:49 -0000 1.407
+++ cp/init.c 1 Jan 2005 01:36:52 -0000
@@ -2341,8 +2341,8 @@ create_temporary_var (tree type)
decl = build_decl (VAR_DECL, NULL_TREE, type);
TREE_USED (decl) = 1;
DECL_ARTIFICIAL (decl) = 1;
- DECL_SOURCE_LOCATION (decl) = input_location;
DECL_IGNORED_P (decl) = 1;
+ DECL_SOURCE_LOCATION (decl) = input_location;
DECL_CONTEXT (decl) = current_function_decl;
return decl;
Index: cp/rtti.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/rtti.c,v
retrieving revision 1.207
diff -u -p -r1.207 rtti.c
--- cp/rtti.c 22 Dec 2004 21:32:33 -0000 1.207
+++ cp/rtti.c 1 Jan 2005 01:36:52 -0000
@@ -350,6 +350,7 @@ get_tinfo_decl (tree type)
TREE_TYPE (name) = type;
DECL_TINFO_P (d) = 1;
DECL_ARTIFICIAL (d) = 1;
+ DECL_IGNORED_P (d) = 1;
TREE_READONLY (d) = 1;
TREE_STATIC (d) = 1;
/* Mark the variable as undefined -- but remember that we can
@@ -778,6 +779,7 @@ tinfo_base_init (tree desc, tree target)
name_decl = build_lang_decl (VAR_DECL, name_name, name_type);
SET_DECL_ASSEMBLER_NAME (name_decl, name_name);
DECL_ARTIFICIAL (name_decl) = 1;
+ DECL_IGNORED_P (name_decl) = 1;
TREE_READONLY (name_decl) = 1;
TREE_STATIC (name_decl) = 1;
DECL_EXTERNAL (name_decl) = 0;
Index: cp/tree.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/tree.c,v
retrieving revision 1.421
diff -u -p -r1.421 tree.c
--- cp/tree.c 22 Dec 2004 03:34:54 -0000 1.421
+++ cp/tree.c 1 Jan 2005 01:36:52 -0000
@@ -241,6 +241,7 @@ build_local_temp (tree type)
{
tree slot = build_decl (VAR_DECL, NULL_TREE, type);
DECL_ARTIFICIAL (slot) = 1;
+ DECL_IGNORED_P (slot) = 1;
DECL_CONTEXT (slot) = current_function_decl;
layout_decl (slot, 0);
return slot;
More information about the Gcc-patches
mailing list