diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-01-16 21:41:44 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-01-16 21:41:44 +0000 |
| commit | 4af2cdb7324916a71dbcfdaa7faa8db625d1d1d3 (patch) | |
| tree | ef0ba794c7271f759ffc4be3c0393b0a1bbe368b | |
| parent | cd9b276966cbd5671c6b3ef180c969708991dcee (diff) | |
| download | bcm5719-llvm-4af2cdb7324916a71dbcfdaa7faa8db625d1d1d3.tar.gz bcm5719-llvm-4af2cdb7324916a71dbcfdaa7faa8db625d1d1d3.zip | |
Also put vtables in a comdat when rtti is disabled.
llvm-svn: 226325
| -rw-r--r-- | clang/lib/CodeGen/MicrosoftCXXABI.cpp | 4 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/microsoft-no-rtti-data.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp index 1402b5263b6..c7e66e9465f 100644 --- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp +++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp @@ -1420,6 +1420,10 @@ llvm::GlobalVariable *MicrosoftCXXABI::getAddrOfVTable(const CXXRecordDecl *RD, } else { llvm_unreachable("unexpected linkage for vftable!"); } + } else { + if (llvm::GlobalValue::isWeakForLinker(VFTableLinkage)) + VTable->setComdat( + CGM.getModule().getOrInsertComdat(VTable->getName())); } VFTable->setLinkage(VFTableLinkage); CGM.setGlobalVisibility(VFTable, RD); diff --git a/clang/test/CodeGenCXX/microsoft-no-rtti-data.cpp b/clang/test/CodeGenCXX/microsoft-no-rtti-data.cpp index fded4c91e4f..68fdf0586c0 100644 --- a/clang/test/CodeGenCXX/microsoft-no-rtti-data.cpp +++ b/clang/test/CodeGenCXX/microsoft-no-rtti-data.cpp @@ -2,7 +2,7 @@ // vftable shouldn't have RTTI data in it. // CHECK-NOT: @"\01??_R4S@@6B@" -// CHECK: @"\01??_7S@@6B@" = linkonce_odr unnamed_addr constant [1 x i8*] [i8* bitcast ({{.*}} @"\01??_GS@@UAEPAXI@Z" to i8*)] +// CHECK: @"\01??_7S@@6B@" = linkonce_odr unnamed_addr constant [1 x i8*] [i8* bitcast ({{.*}} @"\01??_GS@@UAEPAXI@Z" to i8*)], comdat struct type_info; namespace std { using ::type_info; } |
