From 10d9becab760812ead10fdf93c1ef6a90f8bbb53 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 19 Sep 2014 01:54:22 +0000 Subject: [PATCH] Don't use the third field of llvm.global_ctors for MachO. The field is defined as: If the third field is present, non-null, and points to a global variable or function, the initializer function will only run if the associated data from the current module is not discarded. And without COMDATs we can't implement that. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@218097 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGDeclCXX.cpp | 7 +- lib/CodeGen/CodeGenModule.h | 3 + lib/CodeGen/TargetInfo.cpp | 8 ++ ...ember-variable-explicit-specialization.cpp | 121 ++++++++++-------- 4 files changed, 84 insertions(+), 55 deletions(-) diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp index 3e5f42e18c..91ae6a8c2f 100644 --- a/lib/CodeGen/CGDeclCXX.cpp +++ b/lib/CodeGen/CGDeclCXX.cpp @@ -301,6 +301,9 @@ CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D, auto *ISA = D->getAttr(); CodeGenFunction(*this).GenerateCXXGlobalVarDeclInitFunc(Fn, D, Addr, PerformInit); + + llvm::GlobalVariable *Key = supportsCOMDAT() ? Addr : nullptr; + if (D->getTLSKind()) { // FIXME: Should we support init_priority for thread_local? // FIXME: Ideally, initialization of instantiated thread_local static data @@ -330,12 +333,12 @@ CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D, // being initialized. On most platforms, this is a minor startup time // optimization. In the MS C++ ABI, there are no guard variables, so this // COMDAT key is required for correctness. - AddGlobalCtor(Fn, 65535, Addr); + AddGlobalCtor(Fn, 65535, Key); DelayedCXXInitPosition.erase(D); } else if (D->hasAttr()) { // SelectAny globals will be comdat-folded. Put the initializer into a COMDAT // group associated with the global, so the initializers get folded too. - AddGlobalCtor(Fn, 65535, Addr); + AddGlobalCtor(Fn, 65535, Key); DelayedCXXInitPosition.erase(D); } else { llvm::DenseMap::iterator I = diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h index b36d4a66cd..a095c9ddbb 100644 --- a/lib/CodeGen/CodeGenModule.h +++ b/lib/CodeGen/CodeGenModule.h @@ -599,6 +599,9 @@ public: DiagnosticsEngine &getDiags() const { return Diags; } const llvm::DataLayout &getDataLayout() const { return TheDataLayout; } const TargetInfo &getTarget() const { return Target; } + const llvm::Triple &getTriple() const; + bool supportsCOMDAT() const; + CGCXXABI &getCXXABI() const { return *ABI; } llvm::LLVMContext &getLLVMContext() { return VMContext; } diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index 9bf1dbbd0d..cca825c1c5 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -6868,6 +6868,14 @@ static bool getTypeString(SmallStringEnc &Enc, const Decl *D, // Driver code //===----------------------------------------------------------------------===// +const llvm::Triple &CodeGenModule::getTriple() const { + return getTarget().getTriple(); +} + +bool CodeGenModule::supportsCOMDAT() const { + return !getTriple().isOSBinFormatMachO(); +} + const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() { if (TheTargetCodeGenInfo) return *TheTargetCodeGenInfo; diff --git a/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp b/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp index 98c09b8479..04bf79fd15 100644 --- a/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp +++ b/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp @@ -1,25 +1,40 @@ -// RUN: %clang_cc1 %s -std=c++1y -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s -// CHECK: ; ModuleID +// RUN: %clang_cc1 %s -std=c++1y -triple=x86_64-pc-linux -emit-llvm -o - | FileCheck --check-prefix=ELF --check-prefix=ALL %s +// RUN: %clang_cc1 %s -std=c++1y -triple=x86_64-apple-darwin -emit-llvm -o - | FileCheck --check-prefix=MACHO --check-prefix=ALL %s + +// ALL: ; ModuleID extern "C" int foo(); template struct A { static int a; }; template int A::a = foo(); -// CHECK-NOT: @_ZN1AIcE1aE +// ALLK-NOT: @_ZN1AIcE1aE template<> int A::a; -// CHECK: @_ZN1AIbE1aE = global i32 10 +// ALL: @_ZN1AIbE1aE = global i32 10 template<> int A::a = 10; -// CHECK: @llvm.global_ctors = appending global [7 x { i32, void ()*, i8* }] -// CHECK: [{ i32, void ()*, i8* } { i32 65535, void ()* @[[unordered1:[^,]*]], i8* bitcast (i32* @_ZN1AIsE1aE to i8*) }, -// CHECK: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered2:[^,]*]], i8* bitcast (i16* @_Z1xIsE to i8*) }, -// CHECK: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered3:[^,]*]], i8* bitcast (i32* @_ZN2ns1aIiE1iE to i8*) }, -// CHECK: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered4:[^,]*]], i8* bitcast (i32* @_ZN2ns1b1iIiEE to i8*) }, -// CHECK: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered5:[^,]*]], i8* bitcast (i32* @_ZN1AIvE1aE to i8*) }, -// CHECK: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered6:[^,]*]], i8* @_Z1xIcE }, -// CHECK: { i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_static_member_variable_explicit_specialization.cpp, i8* null }] +// ALL: @llvm.global_ctors = appending global [7 x { i32, void ()*, i8* }] + +// ELF: [{ i32, void ()*, i8* } { i32 65535, void ()* @[[unordered1:[^,]*]], i8* bitcast (i32* @_ZN1AIsE1aE to i8*) }, +// MACHO: [{ i32, void ()*, i8* } { i32 65535, void ()* @[[unordered1:[^,]*]], i8* null }, + +// ELF: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered2:[^,]*]], i8* bitcast (i16* @_Z1xIsE to i8*) }, +// MACHO: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered2:[^,]*]], i8* null }, + +// ELF: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered3:[^,]*]], i8* bitcast (i32* @_ZN2ns1aIiE1iE to i8*) }, +// MACHO: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered3:[^,]*]], i8* null }, + +// ELF: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered4:[^,]*]], i8* bitcast (i32* @_ZN2ns1b1iIiEE to i8*) }, +// MACHO: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered4:[^,]*]], i8* null }, + +// ELF: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered5:[^,]*]], i8* bitcast (i32* @_ZN1AIvE1aE to i8*) }, +// MACHO: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered5:[^,]*]], i8* null }, + +// ELF: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered6:[^,]*]], i8* @_Z1xIcE }, +// MACHO: { i32, void ()*, i8* } { i32 65535, void ()* @[[unordered6:[^,]*]], i8* null }, + +// ALL: { i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_static_member_variable_explicit_specialization.cpp, i8* null }] template int A::a; // Unordered int b = foo(); @@ -52,45 +67,45 @@ struct b { template T b::i = foo(); template int b::i; } -// CHECK: define internal void @[[unordered1]] -// CHECK: call i32 @foo() -// CHECK: store {{.*}} @_ZN1AIsE1aE -// CHECK: ret - -// CHECK: define internal void @[[unordered2]] -// CHECK: call i32 @foo() -// CHECK: store {{.*}} @_Z1xIsE -// CHECK: ret - -// CHECK: define internal void @[[unordered3]] -// CHECK: call i32 @foo() -// CHECK: store {{.*}} @_ZN2ns1aIiE1iE -// CHECK: ret - -// CHECK: define internal void @[[unordered4]] -// CHECK: call i32 @foo() -// CHECK: store {{.*}} @_ZN2ns1b1iIiEE -// CHECK: ret - -// CHECK: define internal void @[[unordered5]] -// CHECK: call i32 @foo() -// CHECK: store {{.*}} @_ZN1AIvE1aE -// CHECK: ret - -// CHECK: define internal void @[[unordered6]] -// CHECK: call i32 @foo() -// CHECK: store {{.*}} @_Z1xIcE -// CHECK: ret - -// CHECK: define internal void @_GLOBAL__sub_I_static_member_variable_explicit_specialization.cpp() +// ALL: define internal void @[[unordered1]] +// ALL: call i32 @foo() +// ALL: store {{.*}} @_ZN1AIsE1aE +// ALL: ret + +// ALL: define internal void @[[unordered2]] +// ALL: call i32 @foo() +// ALL: store {{.*}} @_Z1xIsE +// ALL: ret + +// ALL: define internal void @[[unordered3]] +// ALL: call i32 @foo() +// ALL: store {{.*}} @_ZN2ns1aIiE1iE +// ALL: ret + +// ALL: define internal void @[[unordered4]] +// ALL: call i32 @foo() +// ALL: store {{.*}} @_ZN2ns1b1iIiEE +// ALL: ret + +// ALL: define internal void @[[unordered5]] +// ALL: call i32 @foo() +// ALL: store {{.*}} @_ZN1AIvE1aE +// ALL: ret + +// ALL: define internal void @[[unordered6]] +// ALL: call i32 @foo() +// ALL: store {{.*}} @_Z1xIcE +// ALL: ret + +// ALL: define internal void @_GLOBAL__sub_I_static_member_variable_explicit_specialization.cpp() // We call unique stubs for every ordered dynamic initializer in the TU. -// CHECK: call -// CHECK: call -// CHECK: call -// CHECK: call -// CHECK: call -// CHECK: call -// CHECK: call -// CHECK: call -// CHECK-NOT: call -// CHECK: ret +// ALL: call +// ALL: call +// ALL: call +// ALL: call +// ALL: call +// ALL: call +// ALL: call +// ALL: call +// ALL-NOT: call +// ALL: ret -- 2.40.0