From 6ba3b2142afa6dc34bc4946e3d147d768a5523b7 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 8 Oct 2001 09:46:24 -0700 Subject: [PATCH] varasm.c (restore_varasm_status): New. * varasm.c (restore_varasm_status): New. * function.h: Declare it. * function.c (pop_function_context_from): Call it. From-SVN: r46080 --- gcc/ChangeLog | 6 ++++++ gcc/function.c | 1 + gcc/function.h | 1 + gcc/varasm.c | 17 +++++++++++++++++ 4 files changed, 25 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 353151bb3a5..182fd9c931d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-10-08 Richard Henderson + + * varasm.c (restore_varasm_status): New. + * function.h: Declare it. + * function.c (pop_function_context_from): Call it. + 2001-10-08 Richard Henderson * c-common.h (struct c_lang_decl): Add declared_inline. diff --git a/gcc/function.c b/gcc/function.c index fed2b3b68c7..086fdc69d6f 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -386,6 +386,7 @@ pop_function_context_from (context) reg_renumber = 0; restore_emit_status (p); + restore_varasm_status (p); if (restore_lang_status) (*restore_lang_status) (p); diff --git a/gcc/function.h b/gcc/function.h index 8eeda3a2902..c4419604d74 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -592,6 +592,7 @@ extern void free_after_parsing PARAMS ((struct function *)); extern void free_after_compilation PARAMS ((struct function *)); extern void init_varasm_status PARAMS ((struct function *)); +extern void restore_varasm_status PARAMS ((struct function *)); extern void free_varasm_status PARAMS ((struct function *)); extern void free_emit_status PARAMS ((struct function *)); extern void free_stmt_status PARAMS ((struct function *)); diff --git a/gcc/varasm.c b/gcc/varasm.c index b2ce9a6de8f..d2a59d8e43e 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -3493,6 +3493,23 @@ init_varasm_status (f) p->x_const_double_chain = 0; } +/* Nested functions diddle with our const_double_chain via + clear_const_double_mem and const_tiny_rtx. Remove these + entries from our const_double_chain. */ + +void +restore_varasm_status (f) + struct function *f; +{ + rtx *p = &f->varasm->x_const_double_chain; + + while (*p) + if (CONST_DOUBLE_MEM (*p) == cc0_rtx) + *p = CONST_DOUBLE_CHAIN (*p); + else + p = &CONST_DOUBLE_CHAIN (*p); +} + /* Mark PC for GC. */ static void -- 2.30.2