[llvm-branch-commits] [llvm-gcc-branch] r128660 - in /llvm-gcc-4.2/branches/release_29: ./ gcc/fold-const.c

[Bill Wendling]

Author: void
Date: Thu Mar 31 13:56:07 2011
New Revision: 128660

URL: http://llvm.org/viewvc/llvm-project?rev=128660&view=rev
Log:
--- Merging r128619 into '.':
U    gcc/fold-const.c


Modified:
    llvm-gcc-4.2/branches/release_29/   (props changed)
    llvm-gcc-4.2/branches/release_29/gcc/fold-const.c

Propchange: llvm-gcc-4.2/branches/release_29/
------------------------------------------------------------------------------
    svn:mergeinfo = /llvm-gcc-4.2/trunk:128619

Modified: llvm-gcc-4.2/branches/release_29/gcc/fold-const.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_29/gcc/fold-const.c?rev=128660&r1=128659&r2=128660&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/release_29/gcc/fold-const.c (original)
+++ llvm-gcc-4.2/branches/release_29/gcc/fold-const.c Thu Mar 31 13:56:07 2011
@@ -12841,11 +12841,21 @@
 
    case ADDR_EXPR:
       {
-	tree base = get_base_address (TREE_OPERAND (t, 0));
+        tree targ0 = TREE_OPERAND (t, 0);
+	tree base = get_base_address (targ0);
 
 	if (!base)
 	  return false;
 
+        /* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
+        /* Support the "array ref with pointer base" extension. */
+        if (TREE_CODE (targ0) == ARRAY_REF &&
+            TREE_CODE (TREE_TYPE (TREE_OPERAND(targ0, 0))) != ARRAY_TYPE)
+          return false;
+#endif
+        /* LLVM LOCAL end */
+
 	/* Weak declarations may link to NULL.  */
 	if (VAR_OR_FUNCTION_DECL_P (base))
 	  return !DECL_WEAK (base);