From 4b7be243fe6f50696668864ff3ae67ae23a658c5 Mon Sep 17 00:00:00 2001 From: hainque Date: Mon, 6 Jul 2009 14:33:11 +0000 Subject: [PATCH] * gcc-interface/trans.c (Handled_Sequence_Of_Statements_to_gnu, setjmp_longjmp): Attach the exception propagation reraise fallback to the sequence end label location when we have it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149285 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/gcc-interface/trans.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index a2ad971..5e76c14 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2009-07-06 Olivier Hainque + + * gcc-interface/trans.c (Handled_Sequence_Of_Statements_to_gnu, + setjmp_longjmp): Attach the exception propagation reraise fallback + to the sequence end label location when we have it. + 2009-07-04 Francois-Xavier Coudert PR ada/40608 diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 24163b8..1008f1a 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -3071,7 +3071,9 @@ Handled_Sequence_Of_Statements_to_gnu (Node_Id gnat_node) defer abortion. */ gnu_expr = build_call_1_expr (raise_nodefer_decl, TREE_VALUE (gnu_except_ptr_stack)); - set_expr_location_from_node (gnu_expr, gnat_node); + set_expr_location_from_node + (gnu_expr, + Present (End_Label (gnat_node)) ? End_Label (gnat_node) : gnat_node); if (gnu_else_ptr) *gnu_else_ptr = gnu_expr; -- 2.7.4