[clang] [CIR] Address Space support for GlobalOps (PR #179082)
David Rivera via cfe-commits
cfe-commits at lists.llvm.org
Fri Mar 20 10:09:10 PDT 2026
https://github.com/RiverDave updated https://github.com/llvm/llvm-project/pull/179082
>From 589df19dab3683dc2c60228d6030525e906e6b0c Mon Sep 17 00:00:00 2001
From: David Rivera <davidriverg at gmail.com>
Date: Sat, 31 Jan 2026 20:32:24 -0500
Subject: [PATCH 1/6] [CIR] Address Space support for GlobalOps
---
.../CIR/Dialect/Builder/CIRBaseBuilder.h | 14 +++--
clang/include/clang/CIR/Dialect/IR/CIROps.td | 3 +
clang/lib/CIR/CodeGen/CIRGenBuilder.h | 7 ++-
clang/lib/CIR/CodeGen/CIRGenExpr.cpp | 4 +-
clang/lib/CIR/CodeGen/CIRGenModule.cpp | 62 +++++++++++++++----
clang/lib/CIR/CodeGen/CIRGenModule.h | 20 ++++--
clang/lib/CIR/Dialect/IR/CIRDialect.cpp | 23 ++++++-
clang/lib/CIR/Dialect/IR/CIRTypes.cpp | 15 +++++
.../Dialect/Transforms/LoweringPrepare.cpp | 9 ++-
.../CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp | 12 ++--
clang/test/CIR/IR/address-space.cir | 30 +++++++++
clang/test/CIR/IR/invalid-addrspace.cir | 20 ++++++
.../CIR/Lowering/global-address-space.cir | 46 ++++++++++++++
13 files changed, 228 insertions(+), 37 deletions(-)
create mode 100644 clang/test/CIR/Lowering/global-address-space.cir
diff --git a/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h b/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
index 8357e0dc73eb8..bdd1cdc6c44a7 100644
--- a/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
+++ b/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
@@ -19,6 +19,7 @@
#include "llvm/IR/FPEnv.h"
#include "llvm/Support/ErrorHandling.h"
+#include "mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/BuiltinAttributes.h"
#include "mlir/IR/Location.h"
@@ -382,14 +383,15 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
return CIRBaseBuilderTy::createStore(loc, flag, dst);
}
- [[nodiscard]] cir::GlobalOp createGlobal(mlir::ModuleOp mlirModule,
- mlir::Location loc,
- mlir::StringRef name,
- mlir::Type type, bool isConstant,
- cir::GlobalLinkageKind linkage) {
+ [[nodiscard]] cir::GlobalOp
+ createGlobal(mlir::ModuleOp mlirModule, mlir::Location loc,
+ mlir::StringRef name, mlir::Type type, bool isConstant,
+ cir::GlobalLinkageKind linkage,
+ mlir::ptr::MemorySpaceAttrInterface addrSpace) {
mlir::OpBuilder::InsertionGuard guard(*this);
setInsertionPointToStart(mlirModule.getBody());
- return cir::GlobalOp::create(*this, loc, name, type, isConstant, linkage);
+ return cir::GlobalOp::create(*this, loc, name, type, isConstant, addrSpace,
+ linkage);
}
cir::GetMemberOp createGetMember(mlir::Location loc, mlir::Type resultTy,
diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td
index 257505399836d..bffe5c029a08f 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIROps.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td
@@ -2766,6 +2766,7 @@ def CIR_GlobalOp : CIR_Op<"global", [
OptionalAttr<StrAttr>:$sym_visibility,
TypeAttr:$sym_type,
CIR_GlobalLinkageKind:$linkage,
+ OptionalAttr<MemorySpaceAttrInterface>:$addr_space,
OptionalAttr<CIR_TLSModel>:$tls_model,
OptionalAttr<AnyAttr>:$initial_value,
UnitAttr:$comdat,
@@ -2787,6 +2788,7 @@ def CIR_GlobalOp : CIR_Op<"global", [
($tls_model^)?
(`dso_local` $dso_local^)?
(`static_local_guard` `` $static_local_guard^)?
+ (` ` custom<GlobalAddressSpaceValue>($addr_space)^ )?
$sym_name
custom<GlobalOpTypeAndInitialValue>($sym_type, $initial_value,
$ctorRegion, $dtorRegion)
@@ -2807,6 +2809,7 @@ def CIR_GlobalOp : CIR_Op<"global", [
"llvm::StringRef":$sym_name,
"mlir::Type":$sym_type,
CArg<"bool", "false">:$isConstant,
+ CArg<"mlir::ptr::MemorySpaceAttrInterface", "{}">:$addrSpace,
// CIR defaults to external linkage.
CArg<"cir::GlobalLinkageKind",
"cir::GlobalLinkageKind::ExternalLinkage">:$linkage,
diff --git a/clang/lib/CIR/CodeGen/CIRGenBuilder.h b/clang/lib/CIR/CodeGen/CIRGenBuilder.h
index 8bfdbebb2c51f..2cd7152081f1b 100644
--- a/clang/lib/CIR/CodeGen/CIRGenBuilder.h
+++ b/clang/lib/CIR/CodeGen/CIRGenBuilder.h
@@ -12,6 +12,7 @@
#include "Address.h"
#include "CIRGenRecordLayout.h"
#include "CIRGenTypeCache.h"
+#include "mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.h"
#include "mlir/IR/Attributes.h"
#include "mlir/IR/BuiltinAttributes.h"
#include "mlir/Support/LLVM.h"
@@ -695,7 +696,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
[[nodiscard]] cir::GlobalOp
createVersionedGlobal(mlir::ModuleOp module, mlir::Location loc,
mlir::StringRef name, mlir::Type type, bool isConstant,
- cir::GlobalLinkageKind linkage) {
+ cir::GlobalLinkageKind linkage,
+ mlir::ptr::MemorySpaceAttrInterface addrSpace = {}) {
// Create a unique name if the given name is already taken.
std::string uniqueName;
if (unsigned version = globalsVersioning[name.str()]++)
@@ -703,7 +705,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
else
uniqueName = name.str();
- return createGlobal(module, loc, uniqueName, type, isConstant, linkage);
+ return createGlobal(module, loc, uniqueName, type, isConstant, linkage,
+ addrSpace);
}
cir::StackSaveOp createStackSave(mlir::Location loc, mlir::Type ty) {
diff --git a/clang/lib/CIR/CodeGen/CIRGenExpr.cpp b/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
index 5328bb0a812a5..a204f63ca7368 100644
--- a/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
@@ -298,9 +298,9 @@ static LValue emitGlobalVarDeclLValue(CIRGenFunction &cgf, const Expr *e,
// as part of getAddrOfGlobalVar.
mlir::Value v = cgf.cgm.getAddrOfGlobalVar(vd);
- assert(!cir::MissingFeatures::addressSpace());
mlir::Type realVarTy = cgf.convertTypeForMem(vd->getType());
- cir::PointerType realPtrTy = cgf.getBuilder().getPointerTo(realVarTy);
+ cir::PointerType realPtrTy = cir::PointerType::get(
+ realVarTy, mlir::cast<cir::PointerType>(v.getType()).getAddrSpace());
if (realPtrTy != v.getType())
v = cgf.getBuilder().createBitcast(v.getLoc(), v, realPtrTy);
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 228d625ff4747..7c51dab0fb9a5 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -27,12 +27,14 @@
#include "clang/Basic/SourceManager.h"
#include "clang/CIR/Dialect/IR/CIRAttrs.h"
#include "clang/CIR/Dialect/IR/CIRDialect.h"
+#include "clang/CIR/Dialect/IR/CIROpsEnums.h"
#include "clang/CIR/Dialect/IR/CIRTypes.h"
#include "clang/CIR/Interfaces/CIROpInterfaces.h"
#include "clang/CIR/MissingFeatures.h"
#include "CIRGenFunctionInfo.h"
#include "TargetInfo.h"
+#include "mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.h"
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/Location.h"
#include "mlir/IR/MLIRContext.h"
@@ -608,10 +610,11 @@ mlir::Operation *CIRGenModule::getGlobalValue(StringRef name) {
return mlir::SymbolTable::lookupSymbolIn(theModule, name);
}
-cir::GlobalOp CIRGenModule::createGlobalOp(CIRGenModule &cgm,
- mlir::Location loc, StringRef name,
- mlir::Type t, bool isConstant,
- mlir::Operation *insertPoint) {
+cir::GlobalOp
+CIRGenModule::createGlobalOp(CIRGenModule &cgm, mlir::Location loc,
+ StringRef name, mlir::Type t, bool isConstant,
+ mlir::ptr::MemorySpaceAttrInterface addrSpace,
+ mlir::Operation *insertPoint) {
cir::GlobalOp g;
CIRGenBuilderTy &builder = cgm.getBuilder();
@@ -631,7 +634,7 @@ cir::GlobalOp CIRGenModule::createGlobalOp(CIRGenModule &cgm,
builder.setInsertionPointToStart(cgm.getModule().getBody());
}
- g = cir::GlobalOp::create(builder, loc, name, t, isConstant);
+ g = cir::GlobalOp::create(builder, loc, name, t, isConstant, addrSpace);
if (!insertPoint)
cgm.lastGlobalOp = g;
@@ -680,6 +683,39 @@ std::optional<cir::SourceLanguage> CIRGenModule::getCIRSourceLanguage() const {
return std::nullopt;
}
+LangAS CIRGenModule::getGlobalVarAddressSpace(const VarDecl *d) {
+ if (langOpts.OpenCL) {
+ LangAS as = d ? d->getType().getAddressSpace() : LangAS::opencl_global;
+ assert(as == LangAS::opencl_global || as == LangAS::opencl_global_device ||
+ as == LangAS::opencl_global_host || as == LangAS::opencl_constant ||
+ as == LangAS::opencl_local || as >= LangAS::FirstTargetAddressSpace);
+ return as;
+ }
+
+ if (langOpts.SYCLIsDevice &&
+ (!d || d->getType().getAddressSpace() == LangAS::Default))
+ llvm_unreachable("NYI");
+
+ if (langOpts.CUDA && langOpts.CUDAIsDevice) {
+ if (d) {
+ if (d->hasAttr<CUDAConstantAttr>())
+ return LangAS::cuda_constant;
+ if (d->hasAttr<CUDASharedAttr>())
+ return LangAS::cuda_shared;
+ if (d->hasAttr<CUDADeviceAttr>())
+ return LangAS::cuda_device;
+ if (d->getType().isConstQualified())
+ return LangAS::cuda_constant;
+ }
+ return LangAS::cuda_device;
+ }
+
+ if (langOpts.OpenMP)
+ llvm_unreachable("NYI");
+
+ return getTargetCIRGenInfo().getGlobalVarAddressSpace(*this, d);
+}
+
static void setLinkageForGV(cir::GlobalOp &gv, const NamedDecl *nd) {
// Set linkage and visibility in case we never see a definition.
LinkageInfo lv = nd->getLinkageAndVisibility();
@@ -760,7 +796,6 @@ CIRGenModule::getOrCreateCIRGlobal(StringRef mangledName, mlir::Type ty,
}
if (entry) {
- assert(!cir::MissingFeatures::addressSpace());
assert(!cir::MissingFeatures::opGlobalWeakRef());
assert(!cir::MissingFeatures::setDLLStorageClass());
@@ -789,6 +824,9 @@ CIRGenModule::getOrCreateCIRGlobal(StringRef mangledName, mlir::Type ty,
return entry;
}
+ mlir::ptr::MemorySpaceAttrInterface declCIRAS =
+ cir::toCIRAddressSpaceAttr(getMLIRContext(), getGlobalVarAddressSpace(d));
+
mlir::Location loc = getLoc(d->getSourceRange());
// Calculate constant storage flag before creating the global. This was moved
@@ -804,9 +842,9 @@ CIRGenModule::getOrCreateCIRGlobal(StringRef mangledName, mlir::Type ty,
// mlir::SymbolTable::Visibility::Public is the default, no need to explicitly
// mark it as such.
- cir::GlobalOp gv =
- CIRGenModule::createGlobalOp(*this, loc, mangledName, ty, isConstant,
- /*insertPoint=*/entry.getOperation());
+ cir::GlobalOp gv = CIRGenModule::createGlobalOp(
+ *this, loc, mangledName, ty, isConstant, declCIRAS,
+ /*insertPoint=*/entry.getOperation());
// If we already created a global with the same mangled name (but different
// type) before, remove it from its parent.
@@ -911,7 +949,7 @@ mlir::Value CIRGenModule::getAddrOfGlobalVar(const VarDecl *d, mlir::Type ty,
bool tlsAccess = d->getTLSKind() != VarDecl::TLS_None;
cir::GlobalOp g = getOrCreateCIRGlobal(d, ty, isForDefinition);
- mlir::Type ptrTy = builder.getPointerTo(g.getSymType());
+ mlir::Type ptrTy = builder.getPointerTo(g.getSymType(), g.getAddrSpaceAttr());
return cir::GetGlobalOp::create(
builder, getLoc(d->getSourceRange()), ptrTy, g.getSymNameAttr(),
tlsAccess,
@@ -923,8 +961,8 @@ cir::GlobalViewAttr CIRGenModule::getAddrOfGlobalVarAttr(const VarDecl *d) {
mlir::Type ty = getTypes().convertTypeForMem(d->getType());
cir::GlobalOp globalOp = getOrCreateCIRGlobal(d, ty, NotForDefinition);
- assert(!cir::MissingFeatures::addressSpace());
- cir::PointerType ptrTy = builder.getPointerTo(globalOp.getSymType());
+ cir::PointerType ptrTy =
+ builder.getPointerTo(globalOp.getSymType(), globalOp.getAddrSpaceAttr());
return builder.getGlobalViewAttr(ptrTy, globalOp);
}
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.h b/clang/lib/CIR/CodeGen/CIRGenModule.h
index bef154955b9b6..c452100ee61a9 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.h
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.h
@@ -26,6 +26,7 @@
#include "clang/CIR/Dialect/IR/CIRDialect.h"
#include "TargetInfo.h"
+#include "mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/MLIRContext.h"
@@ -206,10 +207,11 @@ class CIRGenModule : public CIRGenTypeCache {
cir::GlobalOp getOrCreateCIRGlobal(const VarDecl *d, mlir::Type ty,
ForDefinition_t isForDefinition);
- static cir::GlobalOp createGlobalOp(CIRGenModule &cgm, mlir::Location loc,
- llvm::StringRef name, mlir::Type t,
- bool isConstant = false,
- mlir::Operation *insertPoint = nullptr);
+ static cir::GlobalOp
+ createGlobalOp(CIRGenModule &cgm, mlir::Location loc, llvm::StringRef name,
+ mlir::Type t, bool isConstant = false,
+ mlir::ptr::MemorySpaceAttrInterface addrSpace = {},
+ mlir::Operation *insertPoint = nullptr);
/// Add a global constructor or destructor to the module.
/// The priority is optional, if not specified, the default priority is used.
@@ -797,6 +799,16 @@ class CIRGenModule : public CIRGenTypeCache {
/// Map source language used to a CIR attribute.
std::optional<cir::SourceLanguage> getCIRSourceLanguage() const;
+
+ /// Return the AST address space of the underlying global variable for D, as
+ /// determined by its declaration. Normally this is the same as the address
+ /// space of D's type, but in CUDA, address spaces are associated with
+ /// declarations, not types. If D is nullptr, return the default address
+ /// space for global variable.
+ ///
+ /// For languages without explicit address spaces, if D has default address
+ /// space, target-specific global or constant address space may be returned.
+ LangAS getGlobalVarAddressSpace(const VarDecl *decl);
};
} // namespace CIRGen
diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
index 0b63c2b7450fb..27194f390f284 100644
--- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
@@ -279,6 +279,13 @@ static void printOmittedTerminatorRegion(mlir::OpAsmPrinter &printer,
/*printBlockTerminators=*/!omitRegionTerm(region));
}
+mlir::OptionalParseResult
+parseGlobalAddressSpaceValue(mlir::AsmParser &p,
+ mlir::ptr::MemorySpaceAttrInterface &attr);
+
+void printGlobalAddressSpaceValue(mlir::AsmPrinter &printer, cir::GlobalOp op,
+ mlir::ptr::MemorySpaceAttrInterface attr);
+
//===----------------------------------------------------------------------===//
// AllocaOp
//===----------------------------------------------------------------------===//
@@ -1744,7 +1751,9 @@ mlir::LogicalResult cir::GlobalOp::verify() {
void cir::GlobalOp::build(
OpBuilder &odsBuilder, OperationState &odsState, llvm::StringRef sym_name,
- mlir::Type sym_type, bool isConstant, cir::GlobalLinkageKind linkage,
+ mlir::Type sym_type, bool isConstant,
+ mlir::ptr::MemorySpaceAttrInterface addrSpace,
+ cir::GlobalLinkageKind linkage,
function_ref<void(OpBuilder &, Location)> ctorBuilder,
function_ref<void(OpBuilder &, Location)> dtorBuilder) {
odsState.addAttribute(getSymNameAttrName(odsState.name),
@@ -1754,6 +1763,8 @@ void cir::GlobalOp::build(
if (isConstant)
odsState.addAttribute(getConstantAttrName(odsState.name),
odsBuilder.getUnitAttr());
+ if (addrSpace)
+ odsState.addAttribute(getAddrSpaceAttrName(odsState.name), addrSpace);
cir::GlobalLinkageKindAttr linkageAttr =
cir::GlobalLinkageKindAttr::get(odsBuilder.getContext(), linkage);
@@ -1907,9 +1918,10 @@ cir::GetGlobalOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
<< "' does not reference a valid cir.global or cir.func";
mlir::Type symTy;
+ mlir::ptr::MemorySpaceAttrInterface symAddrSpaceAttr{};
if (auto g = dyn_cast<GlobalOp>(op)) {
symTy = g.getSymType();
- assert(!cir::MissingFeatures::addressSpace());
+ symAddrSpaceAttr = g.getAddrSpaceAttr();
// Verify that for thread local global access, the global needs to
// be marked with tls bits.
if (getTls() && !g.getTlsModel())
@@ -1935,6 +1947,13 @@ cir::GetGlobalOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
<< resultType.getPointee() << "' does not match type " << symTy
<< " of the global @" << getName();
+ if (symAddrSpaceAttr != resultType.getAddrSpace()) {
+ return emitOpError()
+ << "result type address space does not match the address "
+ "space of the global @"
+ << getName();
+ }
+
return success();
}
diff --git a/clang/lib/CIR/Dialect/IR/CIRTypes.cpp b/clang/lib/CIR/Dialect/IR/CIRTypes.cpp
index 80dce3d3266b5..d96975b3e6aa7 100644
--- a/clang/lib/CIR/Dialect/IR/CIRTypes.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRTypes.cpp
@@ -1057,6 +1057,21 @@ void printAddressSpaceValue(mlir::AsmPrinter &p,
llvm_unreachable("unexpected address-space attribute kind");
}
+mlir::OptionalParseResult
+parseGlobalAddressSpaceValue(mlir::AsmParser &p,
+ mlir::ptr::MemorySpaceAttrInterface &attr) {
+
+ mlir::SMLoc loc = p.getCurrentLocation();
+ if (parseAddressSpaceValue(p, attr).failed())
+ return p.emitError(loc, "failed to parse Address Space Value for GlobalOp");
+ return mlir::success();
+}
+
+void printGlobalAddressSpaceValue(mlir::AsmPrinter &printer, cir::GlobalOp,
+ mlir::ptr::MemorySpaceAttrInterface attr) {
+ printAddressSpaceValue(printer, attr);
+}
+
mlir::ptr::MemorySpaceAttrInterface cir::normalizeDefaultAddressSpace(
mlir::ptr::MemorySpaceAttrInterface addrSpace) {
if (auto langAS =
diff --git a/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp b/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
index dfab0cd7f89c8..fbc7bedab6b63 100644
--- a/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
+++ b/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
@@ -1520,9 +1520,12 @@ void LoweringPreparePass::lowerStoreOfConstAggregate(cir::StoreOp op) {
// constexpr locals as globals when their address is taken), reuse it.
if (!mlir::SymbolTable::lookupSymbolIn(
mlirModule, mlir::StringAttr::get(&getContext(), name))) {
- auto gv = cir::GlobalOp::create(builder, op.getLoc(), name, ty,
- /*isConstant=*/true,
- cir::GlobalLinkageKind::PrivateLinkage);
+ auto gv = cir::GlobalOp::create(
+ builder, op.getLoc(), name, ty,
+ /*isConstant=*/true,
+ cir::LangAddressSpaceAttr::get(&getContext(),
+ cir::LangAddressSpace::Default),
+ cir::GlobalLinkageKind::PrivateLinkage);
mlir::SymbolTable::setSymbolVisibility(
gv, mlir::SymbolTable::Visibility::Private);
gv.setInitialValueAttr(constant);
diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index 44d0dab36c7dd..ad559fbb40a8b 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -2557,8 +2557,9 @@ void CIRToLLVMGlobalOpLowering::setupRegionInitializedLLVMGlobalOp(
// in CIRToLLVMGlobalOpLowering::matchAndRewrite() but that will go
// away when the placeholders are no longer needed.
const bool isConst = op.getConstant();
- assert(!cir::MissingFeatures::addressSpace());
- const unsigned addrSpace = 0;
+ unsigned addrSpace = 0;
+if(auto targetAS = mlir::dyn_cast_if_present<cir::TargetAddressSpaceAttr>(op.getAddrSpaceAttr()))
+ addrSpace = targetAS.getValue();
const bool isDsoLocal = op.getDsoLocal();
const bool isThreadLocal = (bool)op.getTlsModelAttr();
const uint64_t alignment = op.getAlignment().value_or(0);
@@ -2614,11 +2615,10 @@ mlir::LogicalResult CIRToLLVMGlobalOpLowering::matchAndRewrite(
// This is the LLVM dialect type.
const mlir::Type llvmType =
convertTypeForMemory(*getTypeConverter(), dataLayout, cirSymType);
- // FIXME: These default values are placeholders until the the equivalent
- // attributes are available on cir.global ops.
const bool isConst = op.getConstant();
- assert(!cir::MissingFeatures::addressSpace());
- const unsigned addrSpace = 0;
+ unsigned addrSpace = 0;
+if(auto targetAS = mlir::dyn_cast_if_present<cir::TargetAddressSpaceAttr>(op.getAddrSpaceAttr()))
+ addrSpace = targetAS.getValue();
const bool isDsoLocal = op.getDsoLocal();
const bool isThreadLocal = (bool)op.getTlsModelAttr();
const uint64_t alignment = op.getAlignment().value_or(0);
diff --git a/clang/test/CIR/IR/address-space.cir b/clang/test/CIR/IR/address-space.cir
index 9a729c934bc11..0afe840952046 100644
--- a/clang/test/CIR/IR/address-space.cir
+++ b/clang/test/CIR/IR/address-space.cir
@@ -3,6 +3,8 @@
!s32i = !cir.int<s, 32>
module {
+ // ---- PointerType with address space ----
+
cir.func @target_address_space_ptr(%p: !cir.ptr<!s32i, target_address_space(1)>) {
cir.return
}
@@ -30,6 +32,23 @@ module {
cir.func @default_address_space(%p: !cir.ptr<!s32i>) {
cir.return
}
+
+ // ---- GlobalOp with address space ----
+
+ cir.global external target_address_space(1) @global_target_as = #cir.int<42> : !s32i
+ cir.global "private" internal lang_address_space(offload_local) @global_lang_local : !s32i
+ cir.global external lang_address_space(offload_global) @global_lang_global = #cir.int<1> : !s32i
+ cir.global external lang_address_space(offload_constant) @global_lang_constant = #cir.int<2> : !s32i
+ cir.global external @global_default_as = #cir.int<0> : !s32i
+
+ // ---- GetGlobalOp with address space ----
+
+ cir.func @get_global_with_address_space() {
+ %0 = cir.get_global @global_target_as : !cir.ptr<!s32i, target_address_space(1)>
+ %1 = cir.get_global @global_lang_global : !cir.ptr<!s32i, lang_address_space(offload_global)>
+ %2 = cir.get_global @global_default_as : !cir.ptr<!s32i>
+ cir.return
+ }
}
// CHECK: cir.func @target_address_space_ptr(%arg0: !cir.ptr<!s32i, target_address_space(1)>)
@@ -39,3 +58,14 @@ module {
// CHECK: cir.func @lang_address_space_offload_private(%arg0: !cir.ptr<!s32i, lang_address_space(offload_private)>)
// CHECK: cir.func @lang_address_space_offload_generic(%arg0: !cir.ptr<!s32i, lang_address_space(offload_generic)>)
// CHECK: cir.func @default_address_space(%arg0: !cir.ptr<!s32i>)
+
+// CHECK: cir.global external target_address_space(1) @global_target_as = #cir.int<42> : !s32i
+// CHECK: cir.global "private" internal lang_address_space(offload_local) @global_lang_local : !s32i
+// CHECK: cir.global external lang_address_space(offload_global) @global_lang_global = #cir.int<1> : !s32i
+// CHECK: cir.global external lang_address_space(offload_constant) @global_lang_constant = #cir.int<2> : !s32i
+// CHECK: cir.global external @global_default_as = #cir.int<0> : !s32i
+
+// CHECK: cir.func @get_global_with_address_space()
+// CHECK: cir.get_global @global_target_as : !cir.ptr<!s32i, target_address_space(1)>
+// CHECK: cir.get_global @global_lang_global : !cir.ptr<!s32i, lang_address_space(offload_global)>
+// CHECK: cir.get_global @global_default_as : !cir.ptr<!s32i>
diff --git a/clang/test/CIR/IR/invalid-addrspace.cir b/clang/test/CIR/IR/invalid-addrspace.cir
index d38868f1febf0..882199afd6490 100644
--- a/clang/test/CIR/IR/invalid-addrspace.cir
+++ b/clang/test/CIR/IR/invalid-addrspace.cir
@@ -50,3 +50,23 @@ cir.func @lang_address_space_empty(%p : !cir.ptr<!u64i, lang_address_space()>) {
cir.func @lang_address_space_invalid(%p : !cir.ptr<!u64i, lang_address_space(foobar)>) {
cir.return
}
+
+// -----
+
+!s32i = !cir.int<s, 32>
+cir.global external target_address_space(1) @global_in_as1 = #cir.int<42> : !s32i
+cir.func @get_global_mismatched_address_space() {
+ // expected-error at +1 {{result type address space does not match the address space of the global @global_in_as1}}
+ %0 = cir.get_global @global_in_as1 : !cir.ptr<!s32i>
+ cir.return
+}
+
+// -----
+
+!s32i = !cir.int<s, 32>
+cir.global external @global_default_as = #cir.int<0> : !s32i
+cir.func @get_global_unexpected_address_space() {
+ // expected-error at +1 {{result type address space does not match the address space of the global @global_default_as}}
+ %0 = cir.get_global @global_default_as : !cir.ptr<!s32i, target_address_space(1)>
+ cir.return
+}
diff --git a/clang/test/CIR/Lowering/global-address-space.cir b/clang/test/CIR/Lowering/global-address-space.cir
new file mode 100644
index 0000000000000..c9f25e1126098
--- /dev/null
+++ b/clang/test/CIR/Lowering/global-address-space.cir
@@ -0,0 +1,46 @@
+// RUN: cir-opt %s -cir-to-llvm -o %t.mlir
+// RUN: FileCheck --input-file=%t.mlir %s
+
+!s32i = !cir.int<s, 32>
+
+module {
+ cir.global external target_address_space(1) @global_as1 = #cir.int<42> : !s32i
+ // CHECK: llvm.mlir.global external @global_as1(42 : i32) {addr_space = 1 : i32} : i32
+
+ cir.global external target_address_space(3) @global_as3 = #cir.int<100> : !s32i
+ // CHECK: llvm.mlir.global external @global_as3(100 : i32) {addr_space = 3 : i32} : i32
+
+ cir.global external @global_default = #cir.int<0> : !s32i
+ // CHECK: llvm.mlir.global external @global_default(0 : i32) {addr_space = 0 : i32} : i32
+
+ // Test cir.get_global with address space produces correct llvm.mlir.addressof type
+ // CHECK-LABEL: llvm.func @test_get_global_as1
+ cir.func @test_get_global_as1() -> !s32i {
+ // CHECK: %[[ADDR:.*]] = llvm.mlir.addressof @global_as1 : !llvm.ptr<1>
+ // CHECK: %[[VAL:.*]] = llvm.load %[[ADDR]] {{.*}} : !llvm.ptr<1> -> i32
+ // CHECK: llvm.return %[[VAL]] : i32
+ %0 = cir.get_global @global_as1 : !cir.ptr<!s32i, target_address_space(1)>
+ %1 = cir.load %0 : !cir.ptr<!s32i, target_address_space(1)>, !s32i
+ cir.return %1 : !s32i
+ }
+
+ // CHECK-LABEL: llvm.func @test_get_global_as3
+ cir.func @test_get_global_as3() -> !s32i {
+ // CHECK: %[[ADDR:.*]] = llvm.mlir.addressof @global_as3 : !llvm.ptr<3>
+ // CHECK: %[[VAL:.*]] = llvm.load %[[ADDR]] {{.*}} : !llvm.ptr<3> -> i32
+ // CHECK: llvm.return %[[VAL]] : i32
+ %0 = cir.get_global @global_as3 : !cir.ptr<!s32i, target_address_space(3)>
+ %1 = cir.load %0 : !cir.ptr<!s32i, target_address_space(3)>, !s32i
+ cir.return %1 : !s32i
+ }
+
+ // CHECK-LABEL: llvm.func @test_get_global_default
+ cir.func @test_get_global_default() -> !s32i {
+ // CHECK: %[[ADDR:.*]] = llvm.mlir.addressof @global_default : !llvm.ptr
+ // CHECK: %[[VAL:.*]] = llvm.load %[[ADDR]] {{.*}} : !llvm.ptr -> i32
+ // CHECK: llvm.return %[[VAL]] : i32
+ %0 = cir.get_global @global_default : !cir.ptr<!s32i>
+ %1 = cir.load %0 : !cir.ptr<!s32i>, !s32i
+ cir.return %1 : !s32i
+ }
+}
>From 3598781afc448d9a5279192173a0f9aff6e1f504 Mon Sep 17 00:00:00 2001
From: David Rivera <davidriverg at gmail.com>
Date: Thu, 26 Feb 2026 17:21:27 -0500
Subject: [PATCH 2/6] Global AS lowering For CUDA and CIRGen tests for target
AS
---
clang/lib/CIR/CodeGen/CIRGenModule.cpp | 30 +++++++++++++-------
clang/lib/CIR/Dialect/IR/CIRDialect.cpp | 2 ++
clang/test/CIR/CodeGen/address-space.c | 17 +++++++++++
clang/test/CIR/CodeGenCUDA/address-spaces.cu | 9 ++----
4 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 7c51dab0fb9a5..7f0756ffcc9b5 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -824,9 +824,6 @@ CIRGenModule::getOrCreateCIRGlobal(StringRef mangledName, mlir::Type ty,
return entry;
}
- mlir::ptr::MemorySpaceAttrInterface declCIRAS =
- cir::toCIRAddressSpaceAttr(getMLIRContext(), getGlobalVarAddressSpace(d));
-
mlir::Location loc = getLoc(d->getSourceRange());
// Calculate constant storage flag before creating the global. This was moved
@@ -840,6 +837,9 @@ CIRGenModule::getOrCreateCIRGlobal(StringRef mangledName, mlir::Type ty,
astContext, /*ExcludeCtor=*/true, /*ExcludeDtor=*/!needsDtor);
}
+ mlir::ptr::MemorySpaceAttrInterface declCIRAS =
+ cir::toCIRAddressSpaceAttr(getMLIRContext(), getGlobalVarAddressSpace(d));
+
// mlir::SymbolTable::Visibility::Public is the default, no need to explicitly
// mark it as such.
cir::GlobalOp gv = CIRGenModule::createGlobalOp(
@@ -1000,18 +1000,26 @@ void CIRGenModule::emitGlobalVarDefinition(const clang::VarDecl *vd,
std::optional<ConstantEmitter> emitter;
- assert(!cir::MissingFeatures::cudaSupport());
-
// CUDA E.2.4.1 "__shared__ variables cannot have an initialization
// as part of their declaration." Sema has already checked for
- // error cases, so we just need to set Init to UndefValue.
+ // error cases, so we just need to set Init to PoisonValue.
bool isCUDASharedVar =
getLangOpts().CUDAIsDevice && vd->hasAttr<CUDASharedAttr>();
- // TODO(cir): implement isCUDAShadowVar and isCUDADeviceShadowVar, reference:
- // OGCG
-
- if (getLangOpts().CUDA && isCUDASharedVar) {
- init = cir::UndefAttr::get(&getMLIRContext(), convertType(vd->getType()));
+ // Shadows of initialized device-side global variables are also left
+ // undefined.
+ // Managed Variables should be initialized on both host side and device side.
+ bool isCUDAShadowVar =
+ !getLangOpts().CUDAIsDevice && !vd->hasAttr<HIPManagedAttr>() &&
+ (vd->hasAttr<CUDAConstantAttr>() || vd->hasAttr<CUDADeviceAttr>() ||
+ vd->hasAttr<CUDASharedAttr>());
+ bool isCUDADeviceShadowVar =
+ getLangOpts().CUDAIsDevice && !vd->hasAttr<HIPManagedAttr>() &&
+ (vd->getType()->isCUDADeviceBuiltinSurfaceType() ||
+ vd->getType()->isCUDADeviceBuiltinTextureType());
+
+ if (getLangOpts().CUDA &&
+ (isCUDASharedVar || isCUDAShadowVar || isCUDADeviceShadowVar)) {
+ init = cir::PoisonAttr::get(convertType(vd->getType()));
} else if (vd->hasAttr<LoaderUninitializedAttr>()) {
errorNYI(vd->getSourceRange(),
"emitGlobalVarDefinition: loader uninitialized attribute");
diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
index 27194f390f284..dc6056478d1a9 100644
--- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
@@ -1763,6 +1763,8 @@ void cir::GlobalOp::build(
if (isConstant)
odsState.addAttribute(getConstantAttrName(odsState.name),
odsBuilder.getUnitAttr());
+
+ addrSpace = normalizeDefaultAddressSpace(addrSpace);
if (addrSpace)
odsState.addAttribute(getAddrSpaceAttrName(odsState.name), addrSpace);
diff --git a/clang/test/CIR/CodeGen/address-space.c b/clang/test/CIR/CodeGen/address-space.c
index 77404c9eab1ca..491d0218f288b 100644
--- a/clang/test/CIR/CodeGen/address-space.c
+++ b/clang/test/CIR/CodeGen/address-space.c
@@ -5,6 +5,12 @@
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm %s -o %t.ll
// RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG
+// Test global variable with address space
+// CIR: cir.global external @gvar = #cir.ptr<null> : !cir.ptr<!s32i, target_address_space(1)>
+// LLVM: @gvar = global ptr addrspace(1) null
+// OGCG: @gvar = global ptr addrspace(1) null
+int __attribute__((address_space(1))) *gvar;
+
// Test address space 1
// CIR: cir.func {{.*}} @foo(%arg0: !cir.ptr<!s32i, target_address_space(1)>
// LLVM: define dso_local void @foo(ptr addrspace(1) noundef %0)
@@ -28,3 +34,14 @@ void bar(int __attribute__((address_space(0))) *arg) {
void baz(int *arg) {
return;
}
+
+// End to end function returning pointer to address space global
+// CIR: cir.func {{.*}} @get_gvar()
+// CIR: cir.get_global @gvar : !cir.ptr<!cir.ptr<!s32i, target_address_space(1)>>
+// LLVM: define dso_local ptr addrspace(1) @get_gvar()
+// LLVM: load ptr addrspace(1), ptr @gvar
+// OGCG: define dso_local ptr addrspace(1) @get_gvar()
+// OGCG: load ptr addrspace(1), ptr @gvar
+int __attribute__((address_space(1)))* get_gvar() {
+ return gvar;
+}
diff --git a/clang/test/CIR/CodeGenCUDA/address-spaces.cu b/clang/test/CIR/CodeGenCUDA/address-spaces.cu
index 166da94fa905d..1ed52378b99ac 100644
--- a/clang/test/CIR/CodeGenCUDA/address-spaces.cu
+++ b/clang/test/CIR/CodeGenCUDA/address-spaces.cu
@@ -19,17 +19,12 @@
// LLVM-DEVICE: @_ZZ2fnvE1j = internal global i32 undef, align 4
__device__ int a;
-// CIR-DEVICE: cir.global external @[[DEV:.*]] = #cir.int<0> : !s32i {alignment = 4 : i64, cu.externally_initialized = #cir.cu.externally_initialized}
+// CIR-DEVICE: cir.global external lang_address_space(offload_global) @[[DEV:.*]] = #cir.int<0> : !s32i {alignment = 4 : i64, cu.externally_initialized = #cir.cu.externally_initialized}
// LLVM-DEVICE: @[[DEV_LD:.*]] = externally_initialized global i32 0, align 4
// OGCG-DEVICE: @[[DEV_OD:.*]] = addrspace(1) externally_initialized global i32 0, align 4
-__shared__ int b;
-// CIR-DEVICE: cir.global external @[[SHARED:.*]] = #cir.undef : !s32i {alignment = 4 : i64}
-// LLVM-DEVICE: @[[SHARED_LL:.*]] = global i32 undef, align 4
-// OGCG-DEVICE: @[[SHARED_OD:.*]] = addrspace(3) global i32 undef, align 4
-
__constant__ int c;
-// CIR-DEVICE: cir.global constant external @[[CONST:.*]] = #cir.int<0> : !s32i {alignment = 4 : i64, cu.externally_initialized = #cir.cu.externally_initialized}
+// CIR-DEVICE: cir.global constant external lang_address_space(offload_constant) @[[CONST:.*]] = #cir.int<0> : !s32i {alignment = 4 : i64, cu.externally_initialized = #cir.cu.externally_initialized}
// LLVM-DEVICE: @[[CONST_LL:.*]] = externally_initialized constant i32 0, align 4
// OGCG-DEVICE: @[[CONST_OD:.*]] = addrspace(4) externally_initialized constant i32 0, align 4
>From b6368aa62569eb28b31a85d2d8018593e461a874 Mon Sep 17 00:00:00 2001
From: David Rivera <davidriverg at gmail.com>
Date: Thu, 26 Feb 2026 17:31:26 -0500
Subject: [PATCH 3/6] fix fmt
---
clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index ad559fbb40a8b..d570ef375649b 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -2558,8 +2558,9 @@ void CIRToLLVMGlobalOpLowering::setupRegionInitializedLLVMGlobalOp(
// away when the placeholders are no longer needed.
const bool isConst = op.getConstant();
unsigned addrSpace = 0;
-if(auto targetAS = mlir::dyn_cast_if_present<cir::TargetAddressSpaceAttr>(op.getAddrSpaceAttr()))
- addrSpace = targetAS.getValue();
+ if (auto targetAS = mlir::dyn_cast_if_present<cir::TargetAddressSpaceAttr>(
+ op.getAddrSpaceAttr()))
+ addrSpace = targetAS.getValue();
const bool isDsoLocal = op.getDsoLocal();
const bool isThreadLocal = (bool)op.getTlsModelAttr();
const uint64_t alignment = op.getAlignment().value_or(0);
@@ -2615,10 +2616,14 @@ mlir::LogicalResult CIRToLLVMGlobalOpLowering::matchAndRewrite(
// This is the LLVM dialect type.
const mlir::Type llvmType =
convertTypeForMemory(*getTypeConverter(), dataLayout, cirSymType);
+
+ // FIXME: These default values are placeholders until the the equivalent
+ // attributes are available on cir.global ops.
const bool isConst = op.getConstant();
unsigned addrSpace = 0;
-if(auto targetAS = mlir::dyn_cast_if_present<cir::TargetAddressSpaceAttr>(op.getAddrSpaceAttr()))
- addrSpace = targetAS.getValue();
+ if (auto targetAS = mlir::dyn_cast_if_present<cir::TargetAddressSpaceAttr>(
+ op.getAddrSpaceAttr()))
+ addrSpace = targetAS.getValue();
const bool isDsoLocal = op.getDsoLocal();
const bool isThreadLocal = (bool)op.getTlsModelAttr();
const uint64_t alignment = op.getAlignment().value_or(0);
>From 76bb34bea6ba6ab7c7bd840eea1910463ce3ebe1 Mon Sep 17 00:00:00 2001
From: David Rivera <davidriverg at gmail.com>
Date: Thu, 26 Feb 2026 17:37:11 -0500
Subject: [PATCH 4/6] more fmt yo
---
clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index d570ef375649b..6b3be1fa6860e 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -2618,7 +2618,7 @@ mlir::LogicalResult CIRToLLVMGlobalOpLowering::matchAndRewrite(
convertTypeForMemory(*getTypeConverter(), dataLayout, cirSymType);
// FIXME: These default values are placeholders until the the equivalent
- // attributes are available on cir.global ops.
+ // attributes are available on cir.global ops.
const bool isConst = op.getConstant();
unsigned addrSpace = 0;
if (auto targetAS = mlir::dyn_cast_if_present<cir::TargetAddressSpaceAttr>(
>From af709fdb05ef036a0940bbcc9fd39788add8f0bf Mon Sep 17 00:00:00 2001
From: David Rivera <davidriverg at gmail.com>
Date: Thu, 12 Mar 2026 16:20:49 -0400
Subject: [PATCH 5/6] Address another round of comments
---
clang/lib/CIR/CodeGen/CIRGenModule.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 7f0756ffcc9b5..5084d2ab5fa95 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -694,7 +694,7 @@ LangAS CIRGenModule::getGlobalVarAddressSpace(const VarDecl *d) {
if (langOpts.SYCLIsDevice &&
(!d || d->getType().getAddressSpace() == LangAS::Default))
- llvm_unreachable("NYI");
+ errorNYI("SYCL global address space");
if (langOpts.CUDA && langOpts.CUDAIsDevice) {
if (d) {
@@ -711,7 +711,7 @@ LangAS CIRGenModule::getGlobalVarAddressSpace(const VarDecl *d) {
}
if (langOpts.OpenMP)
- llvm_unreachable("NYI");
+ errorNYI("OpenMP global address space");
return getTargetCIRGenInfo().getGlobalVarAddressSpace(*this, d);
}
@@ -801,7 +801,8 @@ CIRGenModule::getOrCreateCIRGlobal(StringRef mangledName, mlir::Type ty,
assert(!cir::MissingFeatures::setDLLStorageClass());
assert(!cir::MissingFeatures::openMP());
- if (entry.getSymType() == ty)
+ if (entry.getSymType() == ty &&
+ (cir::isMatchingAddressSpace(entry.getAddrSpaceAttr(), langAS)))
return entry;
// If there are two attempts to define the same mangled name, issue an
>From c8ad0acf07d9a4171aae650b665bea29f33c85e2 Mon Sep 17 00:00:00 2001
From: David Rivera <davidriverg at gmail.com>
Date: Fri, 13 Mar 2026 04:14:55 -0400
Subject: [PATCH 6/6] Handle proper global AS init.
---
clang/lib/CIR/CodeGen/CIRGenModule.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 5084d2ab5fa95..0b6da006beacc 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -931,7 +931,7 @@ CIRGenModule::getOrCreateCIRGlobal(const VarDecl *d, mlir::Type ty,
ty = getTypes().convertTypeForMem(astTy);
StringRef mangledName = getMangledName(d);
- return getOrCreateCIRGlobal(mangledName, ty, astTy.getAddressSpace(), d,
+ return getOrCreateCIRGlobal(mangledName, ty, getGlobalVarAddressSpace(d), d,
isForDefinition);
}
More information about the cfe-commits
mailing list