[PATCH][mem-ref2] Revert expand_debug_expr change

[Richard Guenther <rguenther@suse.de>]

This reverts the other odd change noticed.  This was probably
fixed by the inliner fixes.

Bootstrapped and tested on x86_64-unknown-linux-gnu, applied.

Richard.

2010-06-25  Richard Guenther  <rguenther@suse.de>

	* cfgexpand.c (expand_debug_expr): Revert change.

Index: gcc/cfgexpand.c
===================================================================
--- gcc/cfgexpand.c	(revision 161369)
+++ gcc/cfgexpand.c	(working copy)
@@ -2504,31 +2504,10 @@ expand_debug_expr (tree exp)
 	HOST_WIDE_INT bitsize, bitpos;
 	tree offset;
 	int volatilep = 0;
-	tree *tp = &exp;
-	tree tem;
+	tree tem = get_inner_reference (exp, &bitsize, &bitpos, &offset,
+					&mode1, &unsignedp, &volatilep, false);
 	rtx orig_op0;
 
-	/* First fold un-folded results from CCP.  */
-	do
-	  {
-	    while (handled_component_p (*tp))
-	      tp = &TREE_OPERAND (*tp, 0);
-	    if (TREE_CODE (*tp) == MEM_REF)
-	      {
-		tem = fold_binary (MEM_REF, TREE_TYPE (*tp),
-				   TREE_OPERAND (*tp, 0),
-				   TREE_OPERAND (*tp, 1));
-		if (!tem)
-		  break;
-		*tp = tem;
-	      }
-	    else
-	      break;
-	  }
-	while (1);
-
-	tem = get_inner_reference (exp, &bitsize, &bitpos, &offset,
-				   &mode1, &unsignedp, &volatilep, false);
 	if (bitsize == 0)
 	  return NULL;