commit 8d5bcefde48af517865086ff85e9926e1a672cc8
author Bill Wendling <isanbard@gmail.com> Thu Mar 31 18:56:07 2011 +0000
committer Bill Wendling <isanbard@gmail.com> Thu Mar 31 18:56:07 2011 +0000
tree 631100d6ed44d66274e489bff84a3530c0073c7c
parent bf6a47a7d3c1a04aec81ed66bdc632cb0f53b241

--- Merging r128619 into '.':
U    gcc/fold-const.c

llvm-svn: 128660

llvm-gcc-4.2/gcc/fold-const.c

diff --git a/llvm-gcc-4.2/gcc/fold-const.c b/llvm-gcc-4.2/gcc/fold-const.c
index 8e0316e..3921ed2 100644
--- a/llvm-gcc-4.2/gcc/fold-const.c
+++ b/llvm-gcc-4.2/gcc/fold-const.c
@@ -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);