Revert earlier fix for PR 14029

2004-08-22 Andrew Pinski  <apinski@apple.com>

        Revert:
        2004-08-22  Andrew Pinski  <apinski@apple.com>
        PR c++/14029
        * typeck.c (build_unary_op): Use &a.b if the foldded lowered
        expression is not constant.

[[Split portion of a mixed commit.]]

From-SVN: r86431.2

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8c74bc29ee7d2a47b674895c6b2b09a12bfb8fbf..1c0f95ec52119b3347224f5e722c9e791707005a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-22 Andrew Pinski  <apinski@apple.com>
+
+       Revert:
+       2004-08-22  Andrew Pinski  <apinski@apple.com>
+       PR c++/14029
+       * typeck.c (build_unary_op): Use &a.b if the foldded lowered
+       expression is not constant.
+
 2004-08-23  Nathan Sidwell  <nathan@codesourcery.com>
 
        * name-lookup.c (pushdecl): Rename build_type_copy call.

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index a614db58978e3f470549137b02f1ed7f51936040..01b969edb97e9f6e989bceb44bf4e09ae0919d51 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4123,11 +4123,6 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert)
            addr = fold (build2 (PLUS_EXPR, argtype, rval,
                                 cp_convert (argtype,
                                             byte_position (field))));
-
-           /* If the folded PLUS_EXPR is not a constant address, wrap
-               it in an ADDR_EXPR.  */
-           if (!TREE_CONSTANT (addr))
-             addr = build_address (arg);
          }
 
        if (TREE_CODE (argtype) == POINTER_TYPE