* except.h (protect_cleanup_actions): Remove it.

	(lang_protect_cleanup_actions): Declare it.
	* except.c (protect_cleanup_actions): Remove it.
	(lang_protect_cleanup_actions): New variable.
	(init_eh): Don't make protect_cleanup_actions a GC root.
	(expand_eh_region_and_cleanup): Call
	lang_protect_cleanup_actions.
	(output_function_exception_table): Remove unused `align'
	variable.
	* varasm.c (assemble_external): Abort if we have not yet
	opened the assembly output file.

	* except.c (cp_protect_cleanup_actions): New function.
	(init_exception_processing): Don't set protect_cleanup_actions
	here.  Do set lang_protect_cleanup_actions.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42218 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 2 deletions

diff --git a/gcc/except.h b/gcc/except.h
index e0c8c2e6959..2720241d9a6 100644
--- a/gcc/except.h
+++ b/gcc/except.h
@@ -147,8 +147,13 @@ extern int duplicate_eh_regions		PARAMS ((struct function *,
 extern void sjlj_emit_function_exit_after	PARAMS ((rtx));
 
 
-/* Nonzero to protect cleanup actions with must-not-throw regions.  */
-extern tree protect_cleanup_actions;
+/* If non-NULL, this is a function that returns an expression to be
+   executed if an unhandled exception is propogated out of a cleanup
+   region.  For example, in C++, an exception thrown by a destructor
+   during stack unwinding is required to result in a call to
+   `std::terminate', so the C++ version of this function returns a
+   CALL_EXPR for `std::terminate'.  */
+extern tree (*lang_protect_cleanup_actions) PARAMS ((void));
 
 /* Return true if type A catches type B.  */
 extern int (*lang_eh_type_covers) PARAMS ((tree a, tree b));