diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2019-04-11 21:26:34 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2019-04-11 21:26:34 +0000 |
| commit | 20118355aa6c517327bbd116a8b69e53999f8232 (patch) | |
| tree | 1445260efcf3ced86dbd38f9a1862ccfa0e8fcd4 /clang/lib/CodeGen/CGDeclCXX.cpp | |
| parent | 8af8b8611c5daee5f04eac93e9315368f42ab70e (diff) | |
| download | bcm5719-llvm-20118355aa6c517327bbd116a8b69e53999f8232.tar.gz bcm5719-llvm-20118355aa6c517327bbd116a8b69e53999f8232.zip | |
Revert r357610, it caused PR41471
llvm-svn: 358232
Diffstat (limited to 'clang/lib/CodeGen/CGDeclCXX.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGDeclCXX.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp index d6fd7f26285..cd3301bd6ca 100644 --- a/clang/lib/CodeGen/CGDeclCXX.cpp +++ b/clang/lib/CodeGen/CGDeclCXX.cpp @@ -481,12 +481,6 @@ CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D, // 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, COMDATKey); - if (getTarget().getCXXABI().isMicrosoft()) { - // In The MS C++, MS add template static data member in the linker - // drective. - assert(COMDATKey); - addUsedGlobal(COMDATKey); - } } else if (D->hasAttr<SelectAnyAttr>()) { // SelectAny globals will be comdat-folded. Put the initializer into a // COMDAT group associated with the global, so the initializers get folded |
