diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2017-07-31 22:35:33 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2017-07-31 22:35:33 +0000 |
| commit | 396943a75b0f3210adbba122a4d9b4b381b99cb4 (patch) | |
| tree | 8851986b184046d4b51fce01358dcdd2c4c9a9d5 | |
| parent | 81fd449238e42fe3f34292bc34b0a15a27b3d44f (diff) | |
| download | bcm5719-llvm-396943a75b0f3210adbba122a4d9b4b381b99cb4.tar.gz bcm5719-llvm-396943a75b0f3210adbba122a4d9b4b381b99cb4.zip | |
Re-apply r309622 with a fix for MSVC.
Patch by Vlad Tsyrklevich!
llvm-svn: 309635
| -rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 9 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp | 15 |
2 files changed, 19 insertions, 5 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 50d702c6226..e27e518c7ea 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -2523,8 +2523,10 @@ LeastDerivedClassWithSameLayout(const CXXRecordDecl *RD) { void CodeGenFunction::EmitTypeMetadataCodeForVCall(const CXXRecordDecl *RD, llvm::Value *VTable, SourceLocation Loc) { - if (CGM.getCodeGenOpts().WholeProgramVTables && - CGM.HasHiddenLTOVisibility(RD)) { + if (SanOpts.has(SanitizerKind::CFIVCall)) + EmitVTablePtrCheckForCall(RD, VTable, CodeGenFunction::CFITCK_VCall, Loc); + else if (CGM.getCodeGenOpts().WholeProgramVTables && + CGM.HasHiddenLTOVisibility(RD)) { llvm::Metadata *MD = CGM.CreateMetadataIdentifierForType(QualType(RD->getTypeForDecl(), 0)); llvm::Value *TypeId = @@ -2536,9 +2538,6 @@ void CodeGenFunction::EmitTypeMetadataCodeForVCall(const CXXRecordDecl *RD, {CastedVTable, TypeId}); Builder.CreateCall(CGM.getIntrinsic(llvm::Intrinsic::assume), TypeTest); } - - if (SanOpts.has(SanitizerKind::CFIVCall)) - EmitVTablePtrCheckForCall(RD, VTable, CodeGenFunction::CFITCK_VCall, Loc); } void CodeGenFunction::EmitVTablePtrCheckForCall(const CXXRecordDecl *RD, diff --git a/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp b/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp new file mode 100644 index 00000000000..b7ef1426a91 --- /dev/null +++ b/clang/test/CodeGenCXX/cfi-vcall-no-trap.cpp @@ -0,0 +1,15 @@ +// Only output llvm.assume(llvm.type.test()) if cfi-vcall is disabled and whole-program-vtables is enabled +// RUN: %clang_cc1 -flto -fvisibility hidden -fsanitize=cfi-vcall -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=CHECK --check-prefix=CFI %s +// RUN: %clang_cc1 -flto -fvisibility hidden -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=CHECK --check-prefix=NOCFI %s + +struct S1 { + virtual void f(); +}; + +// CHECK: define{{.*}}s1f +// CHECK: llvm.type.test +// CFI-NOT: llvm.assume +// NOCFI: llvm.assume +void s1f(S1 *s1) { + s1->f(); +} |
