aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2009-04-07 09:57:06 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2009-04-07 09:57:06 +0000
commit2d5be6c15d0c42c16e19ef34bd93f482688326a1 (patch)
tree37c97dd80b4277fabd4adb8143f32d8f2af142a1
parent10069d53fb535c72d70e2c7dab53347d40a89f37 (diff)
downloadgcc-2d5be6c15d0c42c16e19ef34bd93f482688326a1.zip
gcc-2d5be6c15d0c42c16e19ef34bd93f482688326a1.tar.gz
gcc-2d5be6c15d0c42c16e19ef34bd93f482688326a1.tar.bz2
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
-rw-r--r--gcc/ada/ChangeLog6
-rw-r--r--gcc/ada/gcc-interface/trans.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9dbf5a5..0759002 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,11 @@
2009-04-07 Eric Botcazou <ebotcazou@adacore.com>
+ * gcc-interface/trans.c (establish_gnat_vms_condition_handler): Clear
+ DECL_CONTEXT.
+ (Subprogram_Body_to_gnu): Fix pasto.
+
+2009-04-07 Eric Botcazou <ebotcazou@adacore.com>
+
* gcc-interface/gigi.h (standard_datatypes): Remove ADT_void_type_decl.
(void_type_decl_node): Remove.
(init_gigi_decls): Likewise.
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 96e7c80..ec3ec31 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);