From 2d5be6c15d0c42c16e19ef34bd93f482688326a1 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 7 Apr 2009 09:57:06 +0000 Subject: [PATCH] trans.c (establish_gnat_vms_condition_handler): Clear DECL_CONTEXT. * gcc-interface/trans.c (establish_gnat_vms_condition_handler): Clear DECL_CONTEXT. (Subprogram_Body_to_gnu): Fix pasto. From-SVN: r145661 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/gcc-interface/trans.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 9dbf5a51f91..07590027b67 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2009-04-07 Eric Botcazou + + * gcc-interface/trans.c (establish_gnat_vms_condition_handler): Clear + DECL_CONTEXT. + (Subprogram_Body_to_gnu): Fix pasto. + 2009-04-07 Eric Botcazou * gcc-interface/gigi.h (standard_datatypes): Remove ADT_void_type_decl. diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 96e7c80f659..ec3ec31274a 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -2123,6 +2123,9 @@ establish_gnat_vms_condition_handler (void) ptr_void_type_node, NULL_TREE), NULL_TREE, 0, 1, 1, 0, Empty); + + /* ??? DECL_CONTEXT shouldn't have been set because of DECL_EXTERNAL. */ + DECL_CONTEXT (gnat_vms_condition_handler_decl) = NULL_TREE; } /* Do nothing if the establish builtin is not available, which might happen @@ -2242,7 +2245,8 @@ Subprogram_Body_to_gnu (Node_Id gnat_node) this happens. The foreign or exported condition is expected to satisfy all the constraints. */ if (TARGET_ABI_OPEN_VMS - && (Has_Foreign_Convention (gnat_node) || Is_Exported (gnat_node))) + && (Has_Foreign_Convention (gnat_subprog_id) + || Is_Exported (gnat_subprog_id))) establish_gnat_vms_condition_handler (); process_decls (Declarations (gnat_node), Empty, Empty, true, true); -- 2.30.2