From cbaa1b74423611037f0007ab238bf1e4b8b88a7d Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 23 Aug 2004 18:28:11 +0000 Subject: [PATCH] Revert earlier fix for PR 14029 2004-08-22 Andrew Pinski Revert: 2004-08-22 Andrew Pinski 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 --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/typeck.c | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8c74bc29ee7..1c0f95ec521 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2004-08-22 Andrew Pinski + + Revert: + 2004-08-22 Andrew Pinski + PR c++/14029 + * typeck.c (build_unary_op): Use &a.b if the foldded lowered + expression is not constant. + 2004-08-23 Nathan Sidwell * name-lookup.c (pushdecl): Rename build_type_copy call. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index a614db58978..01b969edb97 100644 --- 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 -- 2.30.2