maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Put more stuff in the comdat used for variables with static init." 

This reverts commit r218089.
It looks like it was causing issues on COFF.

llvm-svn: 218094
This commit is contained in:
Rafael Espindola 2014-09-19 01:28:16 +00:00
parent c0f0c511db
commit 5b6fa2f85a
5 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/CodeGen/CGDeclCXX.cpp
View File

@ -298,11 +298,6 @@ CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D,
llvm::Function *Fn =
CreateGlobalInitOrDestructFunction(*this, FTy, FnName.str());
if (Addr->isWeakForLinker() && supportsCOMDAT()) {
llvm::Comdat *C = TheModule.getOrInsertComdat(Addr->getName());
Fn->setComdat(C);
}
auto *ISA = D->getAttr<InitSegAttr>();
CodeGenFunction(*this).GenerateCXXGlobalVarDeclInitFunc(Fn, D, Addr,
PerformInit);

3
clang/lib/CodeGen/CodeGenModule.h
View File

@ -599,9 +599,6 @@ 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; }

7
clang/lib/CodeGen/ItaniumCXXABI.cpp
View File

@ -1666,13 +1666,6 @@ void ItaniumCXXABI::EmitGuardedInit(CodeGenFunction &CGF,
// If the variable is thread-local, so is its guard variable.
guard->setThreadLocalMode(var->getThreadLocalMode());
// The ABI says: It is suggested that it be emitted in the same COMDAT group
// as the associated data object
if (var->isWeakForLinker() && CGM.supportsCOMDAT()) {
llvm::Comdat *C = CGM.getModule().getOrInsertComdat(var->getName());
guard->setComdat(C);
}
CGM.setStaticLocalDeclGuardAddress(&D, guard);
}

8
clang/lib/CodeGen/TargetInfo.cpp
View File

@ -6868,14 +6868,6 @@ 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;

12
clang/test/CodeGenCXX/static-data-member.cpp
View File

@ -1,13 +1,9 @@
// RUN: %clang_cc1 -triple x86_64-pc-linux -emit-llvm -o - %s | FileCheck %s
// RUN: %clang_cc1 -triple x86_64-apple-darwin -emit-llvm -o - %s | \
// RUN: FileCheck --check-prefix=MACHO %s
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s
// CHECK: @_ZN5test11A1aE = constant i32 10, align 4
// CHECK: @_ZN5test212_GLOBAL__N_11AIiE1xE = internal global i32 0, align 4
// CHECK: @_ZN5test31AIiE1xE = weak_odr global i32 0, align 4
// CHECK: @_ZGVN5test31AIiE1xE = weak_odr global i64 0, comdat $_ZN5test31AIiE1xE
// MACHO: @_ZGVN5test31AIiE1xE = weak_odr global i64 0
// MACHO-NOT: comdat
// CHECK: @_ZGVN5test31AIiE1xE = weak_odr global i64 0
// CHECK: _ZN5test51U2k0E = global i32 0
// CHECK: _ZN5test51U2k1E = global i32 0
@ -64,9 +60,7 @@ namespace test3 {
template <class T> int A<T>::x = foo();
template struct A<int>;
// CHECK-LABEL: define internal void @__cxx_global_var_init1() {{.*}} comdat $_ZN5test31AIiE1xE
// MACHO-LABEL: define internal void @__cxx_global_var_init1()
// MACHO-NOT: comdat
// CHECK-LABEL: define internal void @__cxx_global_var_init1()
// CHECK: [[GUARDBYTE:%.*]] = load i8* bitcast (i64* @_ZGVN5test31AIiE1xE to i8*)
// CHECK-NEXT: [[UNINITIALIZED:%.*]] = icmp eq i8 [[GUARDBYTE]], 0
// CHECK-NEXT: br i1 [[UNINITIALIZED]]