typeck.c (unary_complex_lvalue): Ignore op0 when taking the address of an OFFSET_REF.

	* typeck.c (unary_complex_lvalue): Ignore op0 when taking the
	address of an OFFSET_REF.

From-SVN: r17134

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c320ff1..ca47cfd 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 Thu Dec 18 14:43:19 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
+       * typeck.c (unary_complex_lvalue): Ignore op0 when taking the 
+       address of an OFFSET_REF.
+
        * cp-tree.def: Add AGGR_INIT_EXPR.
        * error.c, tree.c, typeck.c: Replace uses of NEW_EXPR with
        AGGR_INIT_EXPR where appropriate.

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 3656187..5251241 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4672,16 +4672,7 @@ unary_complex_lvalue (code, arg)
                return error_mark_node;
              }
 
-         type = TREE_TYPE (TREE_OPERAND (arg, 0));
-
-         if (TREE_CODE (TREE_TYPE (arg)) == OFFSET_TYPE)
-           {
-             /* Add in the offset to the intermediate subobject, if any.  */
-             offset = get_delta_difference (TYPE_OFFSET_BASETYPE (TREE_TYPE (arg)),
-                                            type,
-                                            0);
-             type = TYPE_OFFSET_BASETYPE (TREE_TYPE (arg));
-           }
+         type = TYPE_OFFSET_BASETYPE (TREE_TYPE (arg));
 
          /* Now in the offset to the final subobject.  */
          offset = size_binop (PLUS_EXPR,