X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fada%2Fgcc-interface%2Fdecl.c;h=3a6ed2607584fa2ce40631dcbbce76456d2dccbf;hp=f048f189b52554f1140724f7ad8fd2cdeae69ce2;hb=877583df6fd83badc401bc63324bd7d9d836e5f1;hpb=61198a831f1a702bd88324b1dca76b2234704fef

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index f048f189b52..3a6ed260758 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -1389,12 +1389,11 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
 	if (TREE_CODE (gnu_decl) == CONST_DECL)
 	  DECL_CONST_ADDRESS_P (gnu_decl) = constructor_address_p (gnu_expr);
 
-	/* If this object is declared in a block that contains a block with an
-	   exception handler, and we aren't using the GCC exception mechanism,
-	   we must force this variable in memory in order to avoid an invalid
-	   optimization.  */
-	if (Exception_Mechanism != Back_End_Exceptions
-	    && Has_Nested_Block_With_Handler (Scope (gnat_entity)))
+	/* If this is declared in a block that contains a block with an
+	   exception handler, we must force this variable in memory to
+	   suppress an invalid optimization.  */
+	if (Has_Nested_Block_With_Handler (Scope (gnat_entity))
+	    && Exception_Mechanism != Back_End_Exceptions)
 	  TREE_ADDRESSABLE (gnu_decl) = 1;
 
 	/* If we are defining an object with variable size or an object with
@@ -2907,7 +2906,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
 			      debug_info_p, false);
 
 	/* If it is passed by reference, force BLKmode to ensure that objects
-	   of this type will always be put in memory.  */
++	   of this type will always be put in memory.  */
 	if (Is_By_Reference_Type (gnat_entity))
 	  SET_TYPE_MODE (gnu_type, BLKmode);
 
@@ -5492,6 +5491,20 @@ constructor_address_p (tree gnu_expr)
   return (TREE_CODE (gnu_expr) == ADDR_EXPR
 	  && TREE_CODE (TREE_OPERAND (gnu_expr, 0)) == CONSTRUCTOR);
 }
+
+/* Return true if GNU_EXPR is (essentially) the address of a CONSTRUCTOR.  */
+
+static bool
+constructor_address_p (tree gnu_expr)
+{
+  while (TREE_CODE (gnu_expr) == NOP_EXPR
+	 || TREE_CODE (gnu_expr) == CONVERT_EXPR
+	 || TREE_CODE (gnu_expr) == NON_LVALUE_EXPR)
+    gnu_expr = TREE_OPERAND (gnu_expr, 0);
+
+  return (TREE_CODE (gnu_expr) == ADDR_EXPR
+	  && TREE_CODE (TREE_OPERAND (gnu_expr, 0)) == CONSTRUCTOR);
+}
 
 /* Given GNAT_ENTITY, elaborate all expressions that are required to
    be elaborated at the point of its definition, but do nothing else.  */