This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH][LTO] Fix merge glitches
- From: Richard Guenther <rguenther at suse dot de>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Diego Novillo <dnovillo at google dot com>
- Date: Tue, 15 Sep 2009 14:27:37 +0200 (CEST)
- Subject: [PATCH][LTO] Fix merge glitches
Going over the branch - trunk diff I noticed a few things slipped
through with my last two merges.
Fixed thus.
Bootstrapped on x86_64-unknown-linux-gnu, testing in progress.
Richard.
2009-09-15 Richard Guenther <rguenther@suse.de>
* tree.c (make_node_stat): Remove setting of DECL_FUNCTION_PERSONALITY.
* tree.h (eh_personality_decl): Remove.
* toplev.c (eh_personality_decl): Likewise.
* dwarf2out.c (dwarf2out_do_cfi_asm): Remove obsolete check.
(dwarf2out_begin_prologue): Remove write-only variable.
* gimple.h (mark_addressable): Remove duplicate prototype.
Index: gcc/tree.c
===================================================================
--- gcc/tree.c (revision 151713)
+++ gcc/tree.c (working copy)
@@ -867,7 +867,6 @@ make_node_stat (enum tree_code code MEM_
{
DECL_ALIGN (t) = FUNCTION_BOUNDARY;
DECL_MODE (t) = FUNCTION_MODE;
- DECL_FUNCTION_PERSONALITY (t) = eh_personality_decl;
}
else
DECL_ALIGN (t) = 1;
Index: gcc/tree.h
===================================================================
--- gcc/tree.h (revision 151713)
+++ gcc/tree.h (working copy)
@@ -4571,9 +4571,6 @@ extern int pedantic_lvalues;
extern GTY(()) tree current_function_decl;
-/* The eh personally function that this FE wants to use. */
-extern GTY(()) tree eh_personality_decl;
-
/* Nonzero means a FUNC_BEGIN label was emitted. */
extern GTY(()) const char * current_function_func_begin_label;
Index: gcc/toplev.c
===================================================================
--- gcc/toplev.c (revision 151713)
+++ gcc/toplev.c (working copy)
@@ -209,9 +209,6 @@ bool in_lto_p = false;
or 0 if between functions. */
tree current_function_decl;
-/* The EH personality function that this FE wants to use. */
-tree eh_personality_decl;
-
/* Set to the FUNC_BEGIN label of the current function, or NULL
if none. */
const char * current_function_func_begin_label;
Index: gcc/dwarf2out.c
===================================================================
--- gcc/dwarf2out.c (revision 151713)
+++ gcc/dwarf2out.c (working copy)
@@ -165,14 +165,6 @@ dwarf2out_do_cfi_asm (void)
return false;
if (saved_do_cfi_asm)
return true;
-
- /* FIXME lto: current_function_decl is not set when this function is called,
- so we cannot find the personality of the current function. For now we
- return true here to avoid a crash. */
- if (current_function_decl
- && !DECL_FUNCTION_PERSONALITY (current_function_decl))
- return true;
-
if (!HAVE_GAS_CFI_PERSONALITY_DIRECTIVE)
return false;
@@ -3889,7 +3881,6 @@ dwarf2out_begin_prologue (unsigned int l
char label[MAX_ARTIFICIAL_LABEL_BYTES];
char * dup_label;
dw_fde_ref fde;
- rtx personality;
section *fnsec;
current_function_func_begin_label = NULL;
@@ -3984,7 +3975,6 @@ dwarf2out_begin_prologue (unsigned int l
dwarf2out_source_line (line, file, 0, true);
#endif
- personality = get_personality_function (current_function_decl);
if (dwarf2out_do_cfi_asm ())
dwarf2out_do_cfi_startproc (false);
else
Index: gcc/gimple.h
===================================================================
--- gcc/gimple.h (revision 151713)
+++ gcc/gimple.h (working copy)
@@ -930,7 +930,6 @@ extern tree get_formal_tmp_var (tree, gi
extern void declare_vars (tree, gimple, bool);
extern void tree_annotate_all_with_location (tree *, location_t);
extern void annotate_all_with_location (gimple_seq, location_t);
-extern void mark_addressable (tree);
/* Validation of GIMPLE expressions. Note that these predicates only check
the basic form of the expression, they don't recurse to make sure that