diff --git a/flang/include/flang/Optimizer/Builder/FIRBuilder.h b/flang/include/flang/Optimizer/Builder/FIRBuilder.h --- a/flang/include/flang/Optimizer/Builder/FIRBuilder.h +++ b/flang/include/flang/Optimizer/Builder/FIRBuilder.h @@ -212,6 +212,10 @@ mlir::StringAttr createLinkOnceLinkage() { return getStringAttr("linkonce"); } + mlir::StringAttr createLinkOnceODRLinkage() { + return getStringAttr("linkonce_odr"); + } + mlir::StringAttr createWeakLinkage() { return getStringAttr("weak"); } /// Get a function by name. If the function exists in the current module, it diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp --- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp +++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp @@ -2647,6 +2647,8 @@ return mlir::LLVM::Linkage::Internal; if (name == "linkonce") return mlir::LLVM::Linkage::Linkonce; + if (name == "linkonce_odr") + return mlir::LLVM::Linkage::LinkonceODR; if (name == "common") return mlir::LLVM::Linkage::Common; if (name == "weak") diff --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp --- a/flang/lib/Optimizer/Dialect/FIROps.cpp +++ b/flang/lib/Optimizer/Dialect/FIROps.cpp @@ -1321,7 +1321,8 @@ mlir::ParseResult fir::GlobalOp::verifyValidLinkage(StringRef linkage) { // Supporting only a subset of the LLVM linkage types for now - static const char *validNames[] = {"common", "internal", "linkonce", "weak"}; + static const char *validNames[] = {"common", "internal", "linkonce", + "linkonce_odr", "weak"}; return mlir::success(llvm::is_contained(validNames, linkage)); } diff --git a/flang/test/Fir/fir-ops.fir b/flang/test/Fir/fir-ops.fir --- a/flang/test/Fir/fir-ops.fir +++ b/flang/test/Fir/fir-ops.fir @@ -432,6 +432,15 @@ fir.has_value %0 : !fir.type } +// CHECK-LABEL: fir.global linkonce_odr @global_linkonce_odr : i32 { +// CHECK: [[VAL_130:%.*]] = arith.constant 1 : i32 +// CHECK: fir.has_value [[VAL_130]] : i32 +// CHECK: } +fir.global linkonce_odr @global_linkonce_odr : i32 { + %0 = arith.constant 1 : i32 + fir.has_value %0 : i32 +} + // CHECK-LABEL: fir.dispatch_table @dispatch_tbl { // CHECK: fir.dt_entry "method", @method_impl // CHECK: }