From: Jason Merrill <jason@yorick.cygnus.com>
Date: Thu, 18 Dec 1997 15:07:48 +0000 (+0000)
Subject: typeck.c (unary_complex_lvalue): Ignore op0 when taking the address of an OFFSET_REF.
X-Git-Tag: releases/libf2c-0.5.21~323
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cac94646f66267096686d2c1116466e19ad1784;p=thirdparty%2Fgcc.git

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 c320ff1aa32e..ca47cfdbb9e3 100644
--- 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 365618743245..525124170386 100644
--- 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,