[llvm] r239261 - Make NaryReassociate pass the address space to isLegalAddressingMode

[Matt Arsenault]

Author: arsenm
Date: Sun Jun  7 15:17:42 2015
New Revision: 239261

URL: http://llvm.org/viewvc/llvm-project?rev=239261&view=rev
Log:
Make NaryReassociate pass the address space to isLegalAddressingMode

No test since the kinds of transforms this prevents seem to not really
be relevant for SI's different addressing modes.

Modified:
    llvm/trunk/lib/Transforms/Scalar/NaryReassociate.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/NaryReassociate.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/NaryReassociate.cpp?rev=239261&r1=239260&r2=239261&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/NaryReassociate.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/NaryReassociate.cpp Sun Jun  7 15:17:42 2015
@@ -317,8 +317,10 @@ static bool isGEPFoldable(GetElementPtrI
       BaseOffset += DL->getStructLayout(STy)->getElementOffset(Field);
     }
   }
+
+  unsigned AddrSpace = GEP->getPointerAddressSpace();
   return TTI->isLegalAddressingMode(GEP->getType()->getElementType(), BaseGV,
-                                    BaseOffset, HasBaseReg, Scale);
+                                    BaseOffset, HasBaseReg, Scale, AddrSpace);
 }
 
 Instruction *NaryReassociate::tryReassociateGEP(GetElementPtrInst *GEP) {