aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorOllie Wild <aaw@google.com>2007-10-08 16:52:27 +0000
committerOllie Wild <aaw@gcc.gnu.org>2007-10-08 16:52:27 +0000
commit6524147cd27499610b5f7b77314cc3e5a37bef3d (patch)
treea9192dd87364f60defb8b8a8f52355444dc0b37d /gcc/ada
parenta222efd88a856f71d4e7dcb14d97d5f5a3aadce3 (diff)
downloadgcc-6524147cd27499610b5f7b77314cc3e5a37bef3d.zip
gcc-6524147cd27499610b5f7b77314cc3e5a37bef3d.tar.gz
gcc-6524147cd27499610b5f7b77314cc3e5a37bef3d.tar.bz2
varasm.c (compare_constant): Removed call to lang_hooks.expand_constant.
gcc/ * varasm.c (compare_constant): Removed call to lang_hooks.expand_constant. (copy_constants): Removed call to lang_hooks.expand_constant. (compute_reloc_for_constant): Removed call to lang_hooks.expand_constant. (output_addressed_constants): Removed call to lang_hooks.expand_constant. (constructor_static_from_elts_p): Removed call to lang_hooks.expand_constant. (output_constant): Removed calls to lang_hooks.expand_constant. * langhooks.h (struct lang_hooks): Removed field expand_constant. * langhooks-def.h (lhd_return_tree): Removed. (LANG_HOOKS_EXPAND_CONSTANT): Removed. (LANG_HOOKS_INITIALIZER): Removed LANG_HOOKS_EXPAND_CONSTANT. * langhooks.c (lhd_return_tree): Removed. gcc/cp/ * typeck2.c (digest_init): Call cplus_expand_constant after convert_for_initialization. * cp-objcp-common.h (LANG_HOOKS_EXPAND_CONSTANT): Removed. * expr.c (cplus_expand_constant): Updated function description. gcc/ada/ * misc.c (LANG_HOOKS_PUSHDECL): Replaced lhd_return_tree with gnat_return_tree. (gnat_init_gcc_eh): Replaced gnat_eh_runtime_type with gnat_return_tree. (gnat_eh_runtime_type): Removed. (gnat_return_tree): New function. From-SVN: r129133
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/ChangeLog9
-rw-r--r--gcc/ada/misc.c14
2 files changed, 15 insertions, 8 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 976534d..aee18d0 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-08 Ollie Wild <aaw@google.com>
+
+ * misc.c (LANG_HOOKS_PUSHDECL): Replaced lhd_return_tree with
+ gnat_return_tree.
+ (gnat_init_gcc_eh): Replaced gnat_eh_runtime_type with
+ gnat_return_tree.
+ (gnat_eh_runtime_type): Removed.
+ (gnat_return_tree): New function.
+
2007-10-08 Ben Elliston <bje@au.ibm.com>
PR ada/33454
diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c
index 473beb0..b783004 100644
--- a/gcc/ada/misc.c
+++ b/gcc/ada/misc.c
@@ -95,7 +95,7 @@ static void gnat_print_decl (FILE *, tree, int);
static void gnat_print_type (FILE *, tree, int);
static const char *gnat_printable_name (tree, int);
static const char *gnat_dwarf_name (tree, int);
-static tree gnat_eh_runtime_type (tree);
+static tree gnat_return_tree (tree);
static int gnat_eh_type_covers (tree, tree);
static void gnat_parse_file (int);
static rtx gnat_expand_expr (tree, rtx, enum machine_mode, int,
@@ -125,7 +125,7 @@ static tree gnat_type_max_size (const_tree);
#undef LANG_HOOKS_GETDECLS
#define LANG_HOOKS_GETDECLS lhd_return_null_tree_v
#undef LANG_HOOKS_PUSHDECL
-#define LANG_HOOKS_PUSHDECL lhd_return_tree
+#define LANG_HOOKS_PUSHDECL gnat_return_tree
#undef LANG_HOOKS_WRITE_GLOBALS
#define LANG_HOOKS_WRITE_GLOBALS gnat_write_global_declarations
#undef LANG_HOOKS_FINISH_INCOMPLETE_DECL
@@ -512,7 +512,7 @@ gnat_init_gcc_eh (void)
? "__gnat_eh_personality_sj"
: "__gnat_eh_personality");
lang_eh_type_covers = gnat_eh_type_covers;
- lang_eh_runtime_type = gnat_eh_runtime_type;
+ lang_eh_runtime_type = gnat_return_tree;
default_init_unwind_resume_libfunc ();
/* Turn on -fexceptions and -fnon-call-exceptions. The first one triggers
@@ -703,15 +703,13 @@ gnat_adjust_rli (record_layout_info rli ATTRIBUTE_UNUSED)
rli->record_align = record_align;
#endif
}
-
-/* These routines are used in conjunction with GCC exception handling. */
-/* Map compile-time to run-time tree for GCC exception handling scheme. */
+/* Do nothing (return the tree node passed). */
static tree
-gnat_eh_runtime_type (tree type)
+gnat_return_tree (tree t)
{
- return type;
+ return t;
}
/* Return true if type A catches type B. Callback for flow analysis from