r309624 - Revert r309622, "Fix logic for generating llvm.type.test()s"

[Peter Collingbourne via cfe-commits]

Author: pcc
Date: Mon Jul 31 13:53:16 2017
New Revision: 309624

URL: http://llvm.org/viewvc/llvm-project?rev=309624&view=rev
Log:
Revert r309622, "Fix logic for generating llvm.type.test()s"

Caused a bot test failure:
http://bb.pgr.jp/builders/test-clang-msc-x64-on-i686-linux-RA/builds/5325

Removed:
    cfe/trunk/test/CodeGenCXX/cfi-vcall-no-trap.cpp
Modified:
    cfe/trunk/lib/CodeGen/CGClass.cpp

Modified: cfe/trunk/lib/CodeGen/CGClass.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=309624&r1=309623&r2=309624&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGClass.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGClass.cpp Mon Jul 31 13:53:16 2017
@@ -2523,10 +2523,8 @@ LeastDerivedClassWithSameLayout(const CX
 void CodeGenFunction::EmitTypeMetadataCodeForVCall(const CXXRecordDecl *RD,
                                                    llvm::Value *VTable,
                                                    SourceLocation Loc) {
-  if (SanOpts.has(SanitizerKind::CFIVCall))
-    EmitVTablePtrCheckForCall(RD, VTable, CodeGenFunction::CFITCK_VCall, Loc);
-  else if (CGM.getCodeGenOpts().WholeProgramVTables &&
-           CGM.HasHiddenLTOVisibility(RD)) {
+  if (CGM.getCodeGenOpts().WholeProgramVTables &&
+      CGM.HasHiddenLTOVisibility(RD)) {
     llvm::Metadata *MD =
         CGM.CreateMetadataIdentifierForType(QualType(RD->getTypeForDecl(), 0));
     llvm::Value *TypeId =
@@ -2538,6 +2536,9 @@ void CodeGenFunction::EmitTypeMetadataCo
                            {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,

Removed: cfe/trunk/test/CodeGenCXX/cfi-vcall-no-trap.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cfi-vcall-no-trap.cpp?rev=309623&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/cfi-vcall-no-trap.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/cfi-vcall-no-trap.cpp (removed)
@@ -1,15 +0,0 @@
-// Only output llvm.assume(llvm.type.test()) if cfi-vcall is disabled and whole-program-vtables is enabled
-// RUN: %clang_cc1 -fvisibility hidden -fsanitize=cfi-vcall -fwhole-program-vtables -emit-llvm -o - %s | FileCheck --check-prefix=CHECK --check-prefix=CFI %s
-// RUN: %clang_cc1 -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();
-}