class.c (build_base_path): Use build_address directly.

        * class.c (build_base_path): Use build_address directly.
        * typeck.c (build_unary_op): Don't lower &a.b to pointer
        arithmetic directly.
        * typeck2.c (store_init_value): Don't assume !TREE_CONSTANT
        means !initializer_constant_valid_p.

        * g++.dg/other/offsetof1.C: Use __builtin_offsetof.

From-SVN: r86795

6 files changed, 18 insertions, 23 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 83e38c94df1..97296e940a5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,13 @@
 2004-08-30  Richard Henderson  <rth@redhat.com>
 
+	* class.c (build_base_path): Use build_address directly.
+	* typeck.c (build_unary_op): Don't lower &a.b to pointer
+	arithmetic directly.
+	* typeck2.c (store_init_value): Don't assume !TREE_CONSTANT
+	means !initializer_constant_valid_p.
+
+2004-08-30  Richard Henderson  <rth@redhat.com>
+
 	* class.c (fixed_type_or_null): Use get_base_address before
 	assuming an ADDR_EXPR is non-null.
 
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 9ef15dcca98..272c4d6a0ff 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -319,7 +319,7 @@ build_base_path (enum tree_code code,
       expr = build_indirect_ref (expr, NULL);
       expr = build_simple_base_path (expr, binfo);
       if (want_pointer)
-	expr = build_unary_op (ADDR_EXPR, expr, 0);
+	expr = build_address (expr);
       target_type = TREE_TYPE (expr);
       goto out;
     }
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 3ec1e427582..e62db90e0d0 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -3963,19 +3963,6 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert)
 	  return arg;
 	}
 
-      /* For &x[y], return x+y.  But, in a template, ARG may be an
-	 ARRAY_REF representing a non-dependent expression.  In that
-	 case, there may be an overloaded "operator []" that will be
-	 chosen at instantiation time; we must not try to optimize
-	 here.  */
-      if (TREE_CODE (arg) == ARRAY_REF && !processing_template_decl)
-	{
-	  if (!cxx_mark_addressable (TREE_OPERAND (arg, 0)))
-	    return error_mark_node;
-	  return cp_build_binary_op (PLUS_EXPR, TREE_OPERAND (arg, 0),
-				     TREE_OPERAND (arg, 1));
-	}
-
       /* Uninstantiated types are all functions.  Taking the
 	 address of a function is a no-op, so just return the
 	 argument.  */
@@ -4099,9 +4086,6 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert)
 	  }
 	else
 	  {
-	    /* Unfortunately we cannot just build an address
-	       expression here, because we would not handle
-	       address-constant-expressions or offsetof correctly.  */
 	    tree field = TREE_OPERAND (arg, 1);
 	    tree rval = build_unary_op (ADDR_EXPR, TREE_OPERAND (arg, 0), 0);
 	    tree binfo = lookup_base (TREE_TYPE (TREE_TYPE (rval)),
@@ -4109,10 +4093,9 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert)
 				      ba_check, NULL);
 	    
 	    rval = build_base_path (PLUS_EXPR, rval, binfo, 1);
-	    rval = build_nop (argtype, rval);
-	    addr = fold (build2 (PLUS_EXPR, argtype, rval,
-				 cp_convert (argtype,
-					     byte_position (field))));
+
+	    TREE_OPERAND (arg, 0) = build_indirect_ref (rval, NULL);
+	    addr = build_address (arg);
 	  }
 
 	if (TREE_CODE (argtype) == POINTER_TYPE
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 8d776915e84..0a8ac753e6c 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -609,7 +609,7 @@ store_init_value (tree decl, tree init)
   else if (TYPE_NEEDS_CONSTRUCTING (type))
     return build2 (INIT_EXPR, type, decl, value);
   else if (TREE_STATIC (decl)
-	   && (! TREE_CONSTANT (value)
+	   && (TREE_SIDE_EFFECTS (value)
 	       || ! initializer_constant_valid_p (value, TREE_TYPE (value))))
     return split_nonconstant_init (decl, value);
   
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 175c078f024..a5f1a49adf2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-30  Richard Henderson  <rth@redhat.com>
 
+	* g++.dg/other/offsetof1.C: Use __builtin_offsetof.
+
+2004-08-30  Richard Henderson  <rth@redhat.com>
+
 	* lib/fortran-torture.exp (fortran-torture-execute): Honor
 	additional_flags set by alternate driver.
 	(ieee-options): New procedure.
diff --git a/gcc/testsuite/g++.dg/other/offsetof1.C b/gcc/testsuite/g++.dg/other/offsetof1.C
index 6d4ebf93c14..39bb7836cee 100644
--- a/gcc/testsuite/g++.dg/other/offsetof1.C
+++ b/gcc/testsuite/g++.dg/other/offsetof1.C
@@ -11,4 +11,4 @@ struct F
   char j;
 };
 
-static int ary[((__SIZE_TYPE__)&((struct F *)0)->j)];
+static int ary[__builtin_offsetof(F, j)];