summaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authormmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>1999-09-05 02:53:03 +0000
committermmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>1999-09-05 02:53:03 +0000
commit9deb9862a46f0630138b76d86b856e56afca0f38 (patch)
tree1ce7c59258b2f25c7f3c44fcd3ce720db0873a9b /gcc/cp
parenta7b0c1703cd201fa6e07895ead90464198f170eb (diff)
downloadgcc-9deb9862a46f0630138b76d86b856e56afca0f38.tar.gz
* decl.c (init_decl_processing): Set mark_lang_status.
(lang_mark_false_label_stack): Adjust prototype. * decl2.c (grok_function_init): Remove extraneous declaration of abort_fndecl. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29120 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl.c8
-rw-r--r--gcc/cp/decl2.c1
3 files changed, 9 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f13f1cf6762..5dedc9cc8b4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
1999-09-04 Mark Mitchell <mark@codesourcery.com>
+ * decl.c (init_decl_processing): Set mark_lang_status.
+ (lang_mark_false_label_stack): Adjust prototype.
+ * decl2.c (grok_function_init): Remove extraneous declaration of
+ abort_fndecl.
+
* Make-lang.in (cc1plus): Remove dependency on GGC.
* Makefile.in (OBJS): Don't mention ggc-simple.o.
(OBJDEPS): Don't mention ggc-simple.o.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index bb1b8b9b66b..4fc9f8b1426 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6205,6 +6205,7 @@ init_decl_processing ()
per-function globals. */
save_lang_status = &push_cp_function_context;
restore_lang_status = &pop_cp_function_context;
+ mark_lang_status = &mark_cp_function_context;
/* Create the global per-function variables. */
push_function_context_to (NULL_TREE);
@@ -14597,12 +14598,11 @@ in_function_p ()
void
-lang_mark_false_label_stack (arg)
- void *arg;
+lang_mark_false_label_stack (l)
+ struct label_node *l;
{
/* C++ doesn't use false_label_stack. It better be NULL. */
- if (*(void **)arg != NULL)
- abort();
+ my_friendly_assert (l != NULL, 19990904);
}
void
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 2aac32a3ada..8e6ae605716 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1917,7 +1917,6 @@ grok_function_init (decl, init)
vtbl. For wellformed call, it should be itself. pr4737 */
if (!DESTRUCTOR_NAME_P (DECL_ASSEMBLER_NAME (decl)))
{
- extern tree abort_fndecl;
/* Give this node rtl from `abort'. */
DECL_RTL (decl) = DECL_RTL (abort_fndecl);
}