Skip to content

[mlir][memref] Do not access erased op in memref.global lowering #148355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthias-springer merged 1 commit into from
Jul 12, 2025
Merged

[mlir][memref] Do not access erased op in memref.global lowering #148355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,9 +754,11 @@ class GlobalMemrefOpLowering : public ConvertOpToLLVMPattern<memref::GlobalOp> {

LLVM::Linkage linkage =
global.isPublic() ? LLVM::Linkage::External : LLVM::Linkage::Private;
bool isExternal = global.isExternal();
bool isUninitialized = global.isUninitialized();

Attribute initialValue = nullptr;
if (!global.isExternal() && !global.isUninitialized()) {
if (!isExternal && !isUninitialized) {
auto elementsAttr = llvm::cast<ElementsAttr>(*global.getInitialValue());
initialValue = elementsAttr;

Expand All @@ -773,35 +775,29 @@ class GlobalMemrefOpLowering : public ConvertOpToLLVMPattern<memref::GlobalOp> {
return global.emitOpError(
"memory space cannot be converted to an integer address space");

// Remove old operation from symbol table.
SymbolTable *symbolTable = nullptr;
if (symbolTables) {
Operation *symbolTableOp =
global->getParentWithTrait<OpTrait::SymbolTable>();

if (symbolTableOp) {
SymbolTable &symbolTable = symbolTables->getSymbolTable(symbolTableOp);
symbolTable.remove(global);
}
symbolTable = &symbolTables->getSymbolTable(symbolTableOp);
symbolTable->remove(global);
}

// Create new operation.
auto newGlobal = rewriter.replaceOpWithNewOp<LLVM::GlobalOp>(
global, arrayTy, global.getConstant(), linkage, global.getSymName(),
initialValue, alignment, *addressSpace);

if (symbolTables) {
Operation *symbolTableOp =
global->getParentWithTrait<OpTrait::SymbolTable>();

if (symbolTableOp) {
SymbolTable &symbolTable = symbolTables->getSymbolTable(symbolTableOp);
symbolTable.insert(newGlobal, rewriter.getInsertionPoint());
}
}
// Insert new operation into symbol table.
if (symbolTable)
symbolTable->insert(newGlobal, rewriter.getInsertionPoint());

if (!global.isExternal() && global.isUninitialized()) {
if (!isExternal && isUninitialized) {
rewriter.createBlock(&newGlobal.getInitializerRegion());
Value undef[] = {
rewriter.create<LLVM::UndefOp>(global.getLoc(), arrayTy)};
rewriter.create<LLVM::ReturnOp>(global.getLoc(), undef);
rewriter.create<LLVM::UndefOp>(newGlobal.getLoc(), arrayTy)};
rewriter.create<LLVM::ReturnOp>(newGlobal.getLoc(), undef);
}
return success();
}
Expand Down
Loading