diff options
Diffstat (limited to 'mlir/lib/Conversion')
-rw-r--r-- | mlir/lib/Conversion/LLVMCommon/PrintCallHelper.cpp | 2 | ||||
-rw-r--r-- | mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mlir/lib/Conversion/LLVMCommon/PrintCallHelper.cpp b/mlir/lib/Conversion/LLVMCommon/PrintCallHelper.cpp index d95aeba..da4443d 100644 --- a/mlir/lib/Conversion/LLVMCommon/PrintCallHelper.cpp +++ b/mlir/lib/Conversion/LLVMCommon/PrintCallHelper.cpp @@ -67,7 +67,7 @@ LogicalResult mlir::LLVM::createPrintStrCall( auto arrayTy = LLVM::LLVMArrayType::get(IntegerType::get(ctx, 8), elementVals.size()); auto globalOp = LLVM::GlobalOp::create( - builder, loc, arrayTy, /*constant=*/true, LLVM::Linkage::Private, + builder, loc, arrayTy, /*isConstant=*/true, LLVM::Linkage::Private, ensureSymbolNameIsUnique(moduleOp, symbolName, symbolTables), dataAttr); auto ptrTy = LLVM::LLVMPointerType::get(builder.getContext()); diff --git a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp index 262e0e7..cc6314c 100644 --- a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp +++ b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp @@ -48,8 +48,8 @@ static bool isStaticStrideOrOffset(int64_t strideOrOffset) { } static FailureOr<LLVM::LLVMFuncOp> -getFreeFn(OpBuilder &b, const LLVMTypeConverter *typeConverter, ModuleOp module, - SymbolTableCollection *symbolTables) { +getFreeFn(OpBuilder &b, const LLVMTypeConverter *typeConverter, + Operation *module, SymbolTableCollection *symbolTables) { bool useGenericFn = typeConverter->getOptions().useGenericFunctions; if (useGenericFn) @@ -483,8 +483,8 @@ public: ConversionPatternRewriter &rewriter) const override { // Insert the `free` declaration if it is not already present. FailureOr<LLVM::LLVMFuncOp> freeFunc = - getFreeFn(rewriter, getTypeConverter(), op->getParentOfType<ModuleOp>(), - symbolTables); + getFreeFn(rewriter, getTypeConverter(), + op->getParentWithTrait<OpTrait::SymbolTable>(), symbolTables); if (failed(freeFunc)) return failure(); Value allocatedPtr; |