[VE] Pass address space to TLI.getPointerTy()

[arichardson]

Summary

Longer-term this will eventually allow removing the default 0 argument.

[arichardson]

rebase

llvm/lib/Target/VE/VEISelLowering.cpp

for (unsigned i = 0, e = ArgLocs.size(); i != e; ++i) {
     //    0      4
     //    +------+------+
     //    | empty| float|
     //    +------+------+
     if (VA.getValVT() == MVT::f32)
       Offset += 4;
 
     int FI = MF.getFrameInfo().CreateFixedObject(ValSize, Offset, true);
-    InVals.push_back(
-        DAG.getLoad(VA.getValVT(), DL, Chain,
-                    DAG.getFrameIndex(FI, getPointerTy(MF.getDataLayout())),
-                    MachinePointerInfo::getFixedStack(MF, FI)));
+    InVals.push_back(DAG.getLoad(
+        VA.getValVT(), DL, Chain,
+        DAG.getFrameIndex(
+            FI, getPointerTy(MF.getDataLayout(),
+                             DAG.getDataLayout().getAllocaAddrSpace())),
   }
 
   if (!IsVarArg)
     return Chain;
 
   // This function takes variable arguments, some of which may have been passed
   // in registers %s0-%s8.
   //

 // TargetLowering Implementation
 //===----------------------------------------------------------------------===//
 
 SDValue VETargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
                                     SmallVectorImpl<SDValue> &InVals) const {
   SelectionDAG &DAG = CLI.DAG;
   SDLoc DL = CLI.DL;
   SDValue Chain = CLI.Chain;
-  auto PtrVT = getPointerTy(DAG.getDataLayout());
+  auto PtrVT = getPointerTy(DAG.getDataLayout(),
+                            DAG.getDataLayout().getProgramAddressSpace());
 
   // VE target does not yet support tail call optimization.
   CLI.IsTailCall = false;
 
   // Get the base offset of the outgoing arguments stack space.
   unsigned ArgsBaseOffset = Subtarget->getRsaSize();
   // Get the size of the preserved arguments area
   unsigned ArgsPreserved = 8 * 8u;
SDValue VETargetLowering::lowerSTORE(SDValue Op, SelectionDAG &DAG) const {
 
   // Otherwise, ask llvm to expand it.
   return SDValue();
 }
 
 SDValue VETargetLowering::lowerVASTART(SDValue Op, SelectionDAG &DAG) const {
   MachineFunction &MF = DAG.getMachineFunction();
   VEMachineFunctionInfo *FuncInfo = MF.getInfo<VEMachineFunctionInfo>();
-  auto PtrVT = getPointerTy(DAG.getDataLayout());
+  auto PtrVT = getPointerTy(DAG.getDataLayout(),
+                            DAG.getDataLayout().getAllocaAddrSpace());
 
   // Need frame address to find the address of VarArgsFrameIndex.
   MF.getFrameInfo().setFrameAddressIsTaken(true);
 
   // vastart just stores the address of the VarArgsFrameIndex slot into the
   // memory location argument.
   SDLoc DL(Op);
   SDValue Offset =
return DAG.getNode(VEISD::EH_SJLJ_SETUP_DISPATCH, DL, MVT::Other,
                      Op.getOperand(0));
 }
 
 static SDValue lowerFRAMEADDR(SDValue Op, SelectionDAG &DAG,
                               const VETargetLowering &TLI,
                               const VESubtarget *Subtarget) {
   SDLoc DL(Op);
   MachineFunction &MF = DAG.getMachineFunction();
-  EVT PtrVT = TLI.getPointerTy(MF.getDataLayout());
+  EVT PtrVT = TLI.getPointerTy(MF.getDataLayout(),
+                               DAG.getDataLayout().getAllocaAddrSpace());
 
   MachineFrameInfo &MFI = MF.getFrameInfo();
   MFI.setFrameAddressIsTaken(true);
 
   unsigned Depth = Op.getConstantOperandVal(0);
   const VERegisterInfo *RegInfo = Subtarget->getRegisterInfo();
   Register FrameReg = RegInfo->getFrameRegister(MF);
   SDValue FrameAddr =