Use upstream method to get global addrespace (NFC)

veselypeta · resistor · commit 600e33e89f6d · 2025-11-04T00:41:49.000+09:00
diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -2315,7 +2315,7 @@ ConstantLValueEmitter::tryEmitBase(const APValue::LValueBase &base) {
 
   // Handle typeid(T).
   if (TypeInfoLValue TI = base.dyn_cast<TypeInfoLValue>()) {
-    unsigned GlobalAS = CGM.getDataLayout().getGlobalsAddressSpace();
+    unsigned GlobalAS = CGM.getDataLayout().getDefaultGlobalsAddressSpace();
     llvm::Type *StdTypeInfoPtrTy = llvm::PointerType::get(CGM.getLLVMContext(), GlobalAS);
     llvm::Constant *TypeInfo =
         CGM.GetAddrOfRTTIDescriptor(QualType(TI.getType(), 0));
diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp
@@ -852,7 +852,7 @@ void BackendConsumer::DiagnosticHandlerImpl(const DiagnosticInfo &DI) {
     FullSourceLoc Loc =
         getBestLocationFromDebugLoc(DICI, BadDebugInfo, Filename, Line, Column);
     const auto &DL = DICI.getFunction().getParent()->getDataLayout();
-    bool IsPurecap = DL.isFatPointer(DL.getGlobalsAddressSpace());
+    bool IsPurecap = DL.isFatPointer(DL.getDefaultGlobalsAddressSpace());
 
     Diags.Report(Loc, diag::warn_fe_backend_cheri_inefficient)
         << DICI.getMessage();
diff --git a/llvm/include/llvm/CodeGen/TargetLowering.h b/llvm/include/llvm/CodeGen/TargetLowering.h
@@ -4090,7 +4090,7 @@ class LLVM_ABI TargetLowering : public TargetLoweringBase {
   virtual unsigned getJumpTableEncoding() const;
 
   virtual MVT getJumpTableRegTy(const DataLayout &DL) const {
-    return getPointerRangeTy(DL, DL.getGlobalsAddressSpace());
+    return getPointerRangeTy(DL, DL.getDefaultGlobalsAddressSpace());
   }
 
   virtual const MCExpr *
diff --git a/llvm/include/llvm/IR/DataLayout.h b/llvm/include/llvm/IR/DataLayout.h
@@ -252,8 +252,6 @@ class DataLayout {
   unsigned getDefaultGlobalsAddressSpace() const {
     return DefaultGlobalsAddrSpace;
   }
-  // TODO: remove this and use the upstreamed version
-  unsigned getGlobalsAddressSpace() const { return DefaultGlobalsAddrSpace; }
 
   bool hasMicrosoftFastStdCallMangling() const {
     return ManglingMode == MM_WinCOFFX86;
diff --git a/llvm/lib/CodeGen/AtomicExpandPass.cpp b/llvm/lib/CodeGen/AtomicExpandPass.cpp
@@ -2119,7 +2119,7 @@ bool AtomicExpandImpl::expandAtomicOpToLibcall(
   std::string LibcallName = TLI->getLibcallName(RTLibType);
   // We are compiling for CHERI purecap mode if the default globals address
   // space is a capability type.
-  bool IsCheriPurecap = DL.isFatPointer(DL.getGlobalsAddressSpace());
+  bool IsCheriPurecap = DL.isFatPointer(DL.getDefaultGlobalsAddressSpace());
   if (ValueOperandIsCap) {
     LibcallName += "_cap";
   }
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -28925,7 +28925,7 @@ SDValue DAGCombiner::convertSelectOfFPConstantsToLoadOffset(
   SDValue CPIdx = DAG.getConstantPool(
       CA,
       TLI.getPointerTy(DAG.getDataLayout(),
-                       DAG.getDataLayout().getGlobalsAddressSpace()),
+                       DAG.getDataLayout().getDefaultGlobalsAddressSpace()),
       TD.getPrefTypeAlign(FPTy));
   Align Alignment = cast<ConstantPoolSDNode>(CPIdx)->getAlign();
 
diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -361,8 +361,9 @@ SelectionDAGLegalize::ExpandConstantFP(ConstantFPSDNode *CFP, bool UseCP) {
   }
 
   SDValue CPIdx = DAG.getConstantPool(
-      LLVMC, TLI.getPointerTy(DAG.getDataLayout(),
-                              DAG.getDataLayout().getGlobalsAddressSpace()));
+      LLVMC,
+      TLI.getPointerTy(DAG.getDataLayout(),
+                       DAG.getDataLayout().getDefaultGlobalsAddressSpace()));
   Align Alignment = cast<ConstantPoolSDNode>(CPIdx)->getAlign();
   if (Extend) {
     SDValue Result = DAG.getExtLoad(
@@ -384,7 +385,7 @@ SDValue SelectionDAGLegalize::ExpandConstant(ConstantSDNode *CP) {
   SDValue CPIdx = DAG.getConstantPool(
       CP->getConstantIntValue(),
       TLI.getPointerTy(DAG.getDataLayout(),
-                       DAG.getDataLayout().getGlobalsAddressSpace()));
+                       DAG.getDataLayout().getDefaultGlobalsAddressSpace()));
   Align Alignment = cast<ConstantPoolSDNode>(CPIdx)->getAlign();
   SDValue Result = DAG.getLoad(
       VT, dl, DAG.getEntryNode(), CPIdx,
@@ -2096,8 +2097,9 @@ SDValue SelectionDAGLegalize::ExpandBUILD_VECTOR(SDNode *Node) {
     }
     Constant *CP = ConstantVector::get(CV);
     SDValue CPIdx = DAG.getConstantPool(
-        CP, TLI.getPointerTy(DAG.getDataLayout(),
-                             DAG.getDataLayout().getGlobalsAddressSpace()));
+        CP,
+        TLI.getPointerTy(DAG.getDataLayout(),
+                         DAG.getDataLayout().getDefaultGlobalsAddressSpace()));
     Align Alignment = cast<ConstantPoolSDNode>(CPIdx)->getAlign();
     return DAG.getLoad(
         VT, dl, DAG.getEntryNode(), CPIdx,
@@ -2887,7 +2889,7 @@ SDValue SelectionDAGLegalize::ExpandLegalINT_TO_FP(SDNode *Node,
   SDValue CPIdx = DAG.getConstantPool(
       FudgeFactor,
       TLI.getPointerTy(DAG.getDataLayout(),
-                       DAG.getDataLayout().getGlobalsAddressSpace()));
+                       DAG.getDataLayout().getDefaultGlobalsAddressSpace()));
   Align Alignment = cast<ConstantPoolSDNode>(CPIdx)->getAlign();
   CPIdx = DAG.getNode(ISD::ADD, dl, CPIdx.getValueType(), CPIdx, CstOffset);
   Alignment = commonAlignment(Alignment, 4);
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -1975,8 +1975,8 @@ SDValue SelectionDAG::getJumpTable(int JTI, EVT VT, bool isTarget,
 
 SDValue SelectionDAG::getJumpTableDebugInfo(int JTI, SDValue Chain,
                                             const SDLoc &DL) {
-  EVT PTy = getTargetLoweringInfo().getPointerTy(getDataLayout(),
-    getDataLayout().getGlobalsAddressSpace());
+  EVT PTy = getTargetLoweringInfo().getPointerTy(
+      getDataLayout(), getDataLayout().getDefaultGlobalsAddressSpace());
   return getNode(ISD::JUMP_TABLE_DEBUG_INFO, DL, MVT::Glue, Chain,
                  getTargetConstant(static_cast<uint64_t>(JTI), DL, PTy, true));
 }
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -2957,7 +2957,7 @@ void SelectionDAGBuilder::visitJumpTable(SwitchCG::JumpTable &JT) {
   assert(JT.Reg && "Should lower JT Header first!");
   const DataLayout &TD = DAG.getDataLayout();
   const auto &TLI = DAG.getTargetLoweringInfo();
-  EVT PTy = TLI.getPointerTy(TD, TD.getGlobalsAddressSpace());
+  EVT PTy = TLI.getPointerTy(TD, TD.getDefaultGlobalsAddressSpace());
   EVT IndexTy = TLI.getJumpTableRegTy(TD);
   SDValue Index =
       DAG.getCopyFromReg(getControlRoot(), *JT.SL, JT.Reg, IndexTy);
@@ -4961,14 +4961,14 @@ static bool getUniformBase(const Value *Ptr, SDValue &Base, SDValue &Index,
     Base = SDB->getValue(C);
 
     ElementCount NumElts = cast<VectorType>(Ptr->getType())->getElementCount();
-    EVT VT = EVT::getVectorVT(*DAG.getContext(),
-                              TLI.getPointerTy(DL, DL.getGlobalsAddressSpace()),
-                              NumElts);
+    EVT VT = EVT::getVectorVT(
+        *DAG.getContext(),
+        TLI.getPointerTy(DL, DL.getDefaultGlobalsAddressSpace()), NumElts);
     Index = DAG.getConstant(0, SDB->getCurSDLoc(), VT);
     IndexType = ISD::SIGNED_SCALED;
     Scale = DAG.getTargetConstant(
         1, SDB->getCurSDLoc(),
-        TLI.getPointerTy(DL, DL.getGlobalsAddressSpace()));
+        TLI.getPointerTy(DL, DL.getDefaultGlobalsAddressSpace()));
     return true;
   }
 
@@ -9850,7 +9850,7 @@ static SDValue getAddressForMemoryInput(SDValue Chain, const SDLoc &Location,
     OpInfo.CallOperand = DAG.getConstantPool(
         cast<Constant>(OpVal),
         TLI.getPointerTy(DAG.getDataLayout(),
-                         DAG.getDataLayout().getGlobalsAddressSpace()));
+                         DAG.getDataLayout().getDefaultGlobalsAddressSpace()));
     return Chain;
   }
 
@@ -10393,7 +10393,7 @@ void SelectionDAGBuilder::visitInlineAsm(const CallBase &Call,
         assert(InOperandVal.getValueType() ==
                    TLI.getPointerTy(
                        DAG.getDataLayout(),
-                       DAG.getDataLayout().getGlobalsAddressSpace()) &&
+                       DAG.getDataLayout().getDefaultGlobalsAddressSpace()) &&
                "Memory operands expect pointer values");
 
         const InlineAsm::ConstraintCode ConstraintID =
diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
@@ -9507,7 +9507,8 @@ SDValue TargetLowering::CTTZTableLookup(SDNode *Node, SelectionDAG &DAG,
       DAG.getConstant(ShiftAmt, DL, VT));
   Lookup = DAG.getSExtOrTrunc(
       Lookup, DL,
-      getPointerRangeTy(TD, DAG.getDataLayout().getGlobalsAddressSpace()));
+      getPointerRangeTy(TD,
+                        DAG.getDataLayout().getDefaultGlobalsAddressSpace()));
 
   SmallVector<uint8_t> Table(BitWidth, 0);
   for (unsigned i = 0; i < BitWidth; i++) {
@@ -9519,7 +9520,7 @@ SDValue TargetLowering::CTTZTableLookup(SDNode *Node, SelectionDAG &DAG,
   // Create a ConstantArray in Constant Pool
   auto *CA = ConstantDataArray::get(*DAG.getContext(), Table);
   SDValue CPIdx = DAG.getConstantPool(
-      CA, getPointerTy(TD, DAG.getDataLayout().getGlobalsAddressSpace()),
+      CA, getPointerTy(TD, DAG.getDataLayout().getDefaultGlobalsAddressSpace()),
       TD.getPrefTypeAlign(CA->getType()));
   SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, DL, VT, DAG.getEntryNode(),
                                    DAG.getMemBasePlusOffset(CPIdx, Lookup, DL),
@@ -10780,8 +10781,8 @@ SDValue TargetLowering::LowerToTLSEmulatedModel(const GlobalAddressSDNode *GA,
                                                 SelectionDAG &DAG) const {
   // Access to address of TLS varialbe xyz is lowered to a function call:
   //   __emutls_get_address( address of global variable named "__emutls_v.xyz" )
-  EVT DataPtrVT = getPointerTy(DAG.getDataLayout(),
-                               DAG.getDataLayout().getGlobalsAddressSpace());
+  EVT DataPtrVT = getPointerTy(
+      DAG.getDataLayout(), DAG.getDataLayout().getDefaultGlobalsAddressSpace());
   PointerType *VoidPtrType = PointerType::get(*DAG.getContext(), 0);
   SDLoc dl(GA);
 
diff --git a/llvm/lib/IR/IRBuilder.cpp b/llvm/lib/IR/IRBuilder.cpp
@@ -51,7 +51,7 @@ IRBuilderBase::CreateGlobalString(StringRef Str, const Twine &Name,
       *M, StrConstant->getType(), true, GlobalValue::PrivateLinkage,
       StrConstant, Name, nullptr, GlobalVariable::NotThreadLocal,
       AddressSpace ? *AddressSpace
-                   : M->getDataLayout().getGlobalsAddressSpace());
+                   : M->getDataLayout().getDefaultGlobalsAddressSpace());
   GV->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
   GV->setAlignment(M->getDataLayout().getPrefTypeAlign(getInt8Ty()));
   return GV;
diff --git a/llvm/lib/Target/Mips/MipsISelLowering.cpp b/llvm/lib/Target/Mips/MipsISelLowering.cpp
@@ -5800,8 +5800,9 @@ SDValue MipsTargetLowering::getPICJumpTableRelocBase(SDValue Table,
                                                      SelectionDAG &DAG) const {
   if (!isPositionIndependent())
     return Table;
-  return DAG.getGLOBAL_OFFSET_TABLE(getPointerTy(
-      DAG.getDataLayout(), DAG.getDataLayout().getGlobalsAddressSpace()));
+  return DAG.getGLOBAL_OFFSET_TABLE(
+      getPointerTy(DAG.getDataLayout(),
+                   DAG.getDataLayout().getDefaultGlobalsAddressSpace()));
 }
 
 bool MipsTargetLowering::useSoftFloat() const {
diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
@@ -9251,7 +9251,7 @@ SDValue RISCVTargetLowering::getDynamicTLSAddr(GlobalAddressSDNode *N,
                                                SelectionDAG &DAG) const {
   SDLoc DL(N);
   Type *CallTy = PointerType::get(
-      *DAG.getContext(), DAG.getDataLayout().getGlobalsAddressSpace());
+      *DAG.getContext(), DAG.getDataLayout().getDefaultGlobalsAddressSpace());
   const GlobalValue *GV = N->getGlobal();
 
   // Use a PC-relative addressing mode to access the global dynamic GOT address.
@@ -9290,7 +9290,7 @@ SDValue RISCVTargetLowering::getTLSDescAddr(GlobalAddressSDNode *N,
                                             SelectionDAG &DAG) const {
   SDLoc DL(N);
   EVT Ty = getPointerTy(DAG.getDataLayout(),
-    DAG.getDataLayout().getGlobalsAddressSpace());
+                        DAG.getDataLayout().getDefaultGlobalsAddressSpace());
   const GlobalValue *GV = N->getGlobal();
 
   // Use a PC-relative addressing mode to access the global dynamic GOT address.
@@ -11108,8 +11108,9 @@ SDValue RISCVTargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
     MCPhysReg PhysReg = RISCVABI::isCheriPureCapABI(Subtarget.getTargetABI())
                             ? RISCV::X4_Y
                             : RISCV::X4;
-    EVT PtrVT = getPointerTy(DAG.getDataLayout(),
-                             DAG.getDataLayout().getGlobalsAddressSpace());
+    EVT PtrVT =
+        getPointerTy(DAG.getDataLayout(),
+                     DAG.getDataLayout().getDefaultGlobalsAddressSpace());
     return DAG.getRegister(PhysReg, PtrVT);
   }
   case Intrinsic::riscv_orc_b:
diff --git a/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp b/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp
@@ -1679,8 +1679,9 @@ bool DevirtModule::shouldExportConstantsAsAbsoluteSymbols() {
 
 void DevirtModule::exportGlobal(VTableSlot Slot, ArrayRef<uint64_t> Args,
                                 StringRef Name, Constant *C) {
-  GlobalAlias *GA = GlobalAlias::create(Int8Ty, M.getDataLayout().getGlobalsAddressSpace(), GlobalValue::ExternalLinkage,
-                                        getGlobalName(Slot, Args, Name), C, &M);
+  GlobalAlias *GA = GlobalAlias::create(
+      Int8Ty, M.getDataLayout().getDefaultGlobalsAddressSpace(),
+      GlobalValue::ExternalLinkage, getGlobalName(Slot, Args, Name), C, &M);
   GA->setVisibility(GlobalValue::HiddenVisibility);
 }
 
@@ -2010,7 +2011,8 @@ void DevirtModule::rebuildGlobal(VTableBits &B) {
   // Build an alias named after the original global, pointing at the second
   // element (the original initializer).
   auto Alias = GlobalAlias::create(
-      B.GV->getInitializer()->getType(), M.getDataLayout().getGlobalsAddressSpace(), B.GV->getLinkage(), "",
+      B.GV->getInitializer()->getType(),
+      M.getDataLayout().getDefaultGlobalsAddressSpace(), B.GV->getLinkage(), "",
       ConstantExpr::getInBoundsGetElementPtr(
           NewInit->getType(), NewGV,
           ArrayRef<Constant *>{ConstantInt::get(Int32Ty, 0),
diff --git a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
@@ -425,7 +425,8 @@ bool ModuleSanitizerCoverage::instrumentModule() {
   IntptrTy = Type::getIntNTy(*C, DL->getPointerSizeInBits(0));
 
   PcAddrTy = Type::getIntNTy(*C, DL->getIndexSizeInBits(DL->getProgramAddressSpace()));
-  PtrTy = PointerType::get(*C, DL->getGlobalsAddressSpace());
+  unsigned GlobalAS = DL->getDefaultGlobalsAddressSpace();
+  PtrTy = PointerType::get(*C, GlobalAS);
   Type *VoidTy = Type::getVoidTy(*C);
   IRBuilder<> IRB(*C);
   Int64Ty = IRB.getInt64Ty();
diff --git a/llvm/lib/Transforms/Utils/BuildLibCalls.cpp b/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
@@ -2074,8 +2074,10 @@ Value *llvm::emitMalloc(Value *Num, IRBuilderBase &B, const DataLayout &DL,
 
   StringRef MallocName = TLI->getName(LibFunc_malloc);
   Type *SizeTTy = getSizeTTy(B, TLI);
-  FunctionCallee Malloc =
-      getOrInsertLibFunc(M, *TLI, LibFunc_malloc, PointerType::get(M->getContext(), DL.getGlobalsAddressSpace()), SizeTTy);
+  FunctionCallee Malloc = getOrInsertLibFunc(
+      M, *TLI, LibFunc_malloc,
+      PointerType::get(M->getContext(), DL.getDefaultGlobalsAddressSpace()),
+      SizeTTy);
   inferNonMandatoryLibFuncAttrs(M, MallocName, *TLI);
   CallInst *CI = B.CreateCall(Malloc, Num, MallocName);
 
@@ -2165,7 +2167,8 @@ Value *llvm::emitHotColdNew(Value *Num, IRBuilderBase &B,
 
   StringRef Name = TLI->getName(NewFunc);
   const DataLayout &DL = M->getDataLayout();
-  auto VoidPtrTy = PointerType::get(M->getContext(), DL.getGlobalsAddressSpace());
+  auto VoidPtrTy =
+      PointerType::get(M->getContext(), DL.getDefaultGlobalsAddressSpace());
   FunctionCallee Func =
       M->getOrInsertFunction(Name, VoidPtrTy, Num->getType(), B.getInt8Ty());
   inferNonMandatoryLibFuncAttrs(M, Name, *TLI);
@@ -2187,7 +2190,8 @@ Value *llvm::emitHotColdNewNoThrow(Value *Num, Value *NoThrow, IRBuilderBase &B,
 
   StringRef Name = TLI->getName(NewFunc);
   const DataLayout &DL = M->getDataLayout();
-  auto VoidPtrTy = PointerType::get(M->getContext(), DL.getGlobalsAddressSpace());
+  auto VoidPtrTy =
+      PointerType::get(M->getContext(), DL.getDefaultGlobalsAddressSpace());
   FunctionCallee Func = M->getOrInsertFunction(
       Name, VoidPtrTy, Num->getType(), NoThrow->getType(), B.getInt8Ty());
   inferNonMandatoryLibFuncAttrs(M, Name, *TLI);
@@ -2209,7 +2213,8 @@ Value *llvm::emitHotColdNewAligned(Value *Num, Value *Align, IRBuilderBase &B,
 
   StringRef Name = TLI->getName(NewFunc);
   const DataLayout &DL = M->getDataLayout();
-  auto VoidPtrTy = PointerType::get(M->getContext(), DL.getGlobalsAddressSpace());
+  auto VoidPtrTy =
+      PointerType::get(M->getContext(), DL.getDefaultGlobalsAddressSpace());
   FunctionCallee Func = M->getOrInsertFunction(
       Name, VoidPtrTy, Num->getType(), Align->getType(), B.getInt8Ty());
   inferNonMandatoryLibFuncAttrs(M, Name, *TLI);
@@ -2232,7 +2237,8 @@ Value *llvm::emitHotColdNewAlignedNoThrow(Value *Num, Value *Align,
 
   StringRef Name = TLI->getName(NewFunc);
   const DataLayout &DL = M->getDataLayout();
-  auto VoidPtrTy = PointerType::get(M->getContext(), DL.getGlobalsAddressSpace());
+  auto VoidPtrTy =
+      PointerType::get(M->getContext(), DL.getDefaultGlobalsAddressSpace());
   FunctionCallee Func = M->getOrInsertFunction(
       Name, VoidPtrTy, Num->getType(), Align->getType(), NoThrow->getType(),
       B.getInt8Ty());
diff --git a/llvm/lib/Transforms/Utils/EscapeEnumerator.cpp b/llvm/lib/Transforms/Utils/EscapeEnumerator.cpp
@@ -71,8 +71,9 @@ IRBuilder<> *EscapeEnumerator::Next() {
   LLVMContext &C = F.getContext();
   BasicBlock *CleanupBB = BasicBlock::Create(C, CleanupBBName, &F);
   Type *ExnTy = StructType::get(
-    PointerType::get(C, F.getParent()->getDataLayout().getGlobalsAddressSpace()),
-    Type::getInt32Ty(C));
+      PointerType::get(
+          C, F.getParent()->getDataLayout().getDefaultGlobalsAddressSpace()),
+      Type::getInt32Ty(C));
   if (!F.hasPersonalityFn()) {
     FunctionCallee PersFn = getDefaultPersonalityFn(F.getParent());
     F.setPersonalityFn(cast<Constant>(PersFn.getCallee()));
diff --git a/llvm/lib/Transforms/Utils/ModuleUtils.cpp b/llvm/lib/Transforms/Utils/ModuleUtils.cpp
@@ -34,7 +34,7 @@ static void appendToGlobalArray(StringRef ArrayName, Module &M, Function *F,
   unsigned CtorPtrAS = M.getDataLayout().getProgramAddressSpace();
   llvm::Type *CtorPFTy = llvm::PointerType::get(M.getContext(), CtorPtrAS);
   llvm::Type *ArgTy =
-      IRB.getPtrTy(M.getDataLayout().getGlobalsAddressSpace());
+      IRB.getPtrTy(M.getDataLayout().getDefaultGlobalsAddressSpace());
 
   // Get the current set of static global constructors and add the new ctor
   // to the list.
@@ -52,7 +52,8 @@ static void appendToGlobalArray(StringRef ArrayName, Module &M, Function *F,
   } else {
     EltTy = StructType::get(
         IRB.getInt32Ty(),
-        PointerType::get(M.getContext(), F->getAddressSpace()), IRB.getPtrTy(M.getDataLayout().getGlobalsAddressSpace()));
+        PointerType::get(M.getContext(), F->getAddressSpace()),
+        IRB.getPtrTy(M.getDataLayout().getDefaultGlobalsAddressSpace()));
   }
 
   // Build a 3 field global_ctor entry.  We don't take a comdat key.
diff --git a/llvm/lib/Transforms/Utils/SanitizerStats.cpp b/llvm/lib/Transforms/Utils/SanitizerStats.cpp
diff --git a/llvm/tools/bugpoint/Miscompilation.cpp b/llvm/tools/bugpoint/Miscompilation.cpp

Original file line number	Diff line number	Diff line change
`@@ -4090,7 +4090,7 @@ class LLVM_ABI TargetLowering : public TargetLoweringBase {`
`4090`	`4090`	`virtual unsigned getJumpTableEncoding() const;`
`4091`	`4091`
`4092`	`4092`	`virtual MVT getJumpTableRegTy(const DataLayout &DL) const {`
`4093`		`- return getPointerRangeTy(DL, DL.getGlobalsAddressSpace());`
	`4093`	`+ return getPointerRangeTy(DL, DL.getDefaultGlobalsAddressSpace());`
`4094`	`4094`	`}`
`4095`	`4095`
`4096`	`4096`	`virtual const MCExpr *`
Original file line number	Diff line number	Diff line change
`@@ -252,8 +252,6 @@ class DataLayout {`
`252`	`252`	`unsigned getDefaultGlobalsAddressSpace() const {`
`253`	`253`	`return DefaultGlobalsAddrSpace;`
`254`	`254`	`}`
`255`		`- // TODO: remove this and use the upstreamed version`
`256`		`- unsigned getGlobalsAddressSpace() const { return DefaultGlobalsAddrSpace; }`
`257`	`255`
`258`	`256`	`bool hasMicrosoftFastStdCallMangling() const {`
`259`	`257`	`return ManglingMode == MM_WinCOFFX86;`
Original file line number	Diff line number	Diff line change
`@@ -2119,7 +2119,7 @@ bool AtomicExpandImpl::expandAtomicOpToLibcall(`
`2119`	`2119`	`std::string LibcallName = TLI->getLibcallName(RTLibType);`
`2120`	`2120`	`// We are compiling for CHERI purecap mode if the default globals address`
`2121`	`2121`	`// space is a capability type.`
`2122`		`- bool IsCheriPurecap = DL.isFatPointer(DL.getGlobalsAddressSpace());`
	`2122`	`+ bool IsCheriPurecap = DL.isFatPointer(DL.getDefaultGlobalsAddressSpace());`
`2123`	`2123`	`if (ValueOperandIsCap) {`
`2124`	`2124`	`LibcallName += "_cap";`
`2125`	`2125`	`}`