diff --git a/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h b/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h --- a/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h +++ b/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h @@ -61,6 +61,8 @@ LLVM::ensureDistinctSuccessors(m); T translator(m, std::move(llvmModule)); + if (failed(translator.convertFunctionSignatures())) + return nullptr; if (failed(translator.convertGlobals())) return nullptr; if (failed(translator.convertFunctions())) @@ -94,6 +96,7 @@ /// Check whether the module contains only supported ops directly in its body. static LogicalResult checkSupportedModuleOps(Operation *m); + LogicalResult convertFunctionSignatures(); LogicalResult convertFunctions(); LogicalResult convertGlobals(); LogicalResult convertOneFunction(LLVMFuncOp func); diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp --- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp +++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp @@ -783,12 +783,13 @@ return success(); } -LogicalResult ModuleTranslation::convertFunctions() { +LogicalResult ModuleTranslation::convertFunctionSignatures() { // Lock access to the llvm context. llvm::sys::SmartScopedLock scopedLock( llvmDialect->getLLVMContextMutex()); + // Declare all functions first because there may be function calls that form a - // call graph with cycles. + // call graph with cycles, or global initializers that reference functions. for (auto function : getModuleBody(mlirModule).getOps()) { llvm::FunctionCallee llvmFuncCst = llvmModule->getOrInsertFunction( function.getName(), @@ -802,6 +803,14 @@ return failure(); } + return success(); +} + +LogicalResult ModuleTranslation::convertFunctions() { + // Lock access to the llvm context. + llvm::sys::SmartScopedLock scopedLock( + llvmDialect->getLLVMContextMutex()); + // Convert functions. for (auto function : getModuleBody(mlirModule).getOps()) { // Ignore external functions. diff --git a/mlir/test/Target/llvmir.mlir b/mlir/test/Target/llvmir.mlir --- a/mlir/test/Target/llvmir.mlir +++ b/mlir/test/Target/llvmir.mlir @@ -1230,3 +1230,13 @@ // CHECK: ret bfloat 0xR4120 +// ----- + +llvm.func @address_taken() { + llvm.return +} + +llvm.mlir.global internal constant @taker_of_address() : !llvm<"void()*"> { + %0 = llvm.mlir.addressof @address_taken : !llvm<"void()*"> + llvm.return %0 : !llvm<"void()*"> +}