r344961 - Revert "Ensure sanitizer check function calls have a !dbg location"

[Vlad Tsyrklevich via cfe-commits]

Author: vlad.tsyrklevich
Date: Mon Oct 22 14:51:58 2018
New Revision: 344961

URL: http://llvm.org/viewvc/llvm-project?rev=344961&view=rev
Log:
Revert "Ensure sanitizer check function calls have a !dbg location"

This reverts commit r344915. It was causing exceptions on the
x86_64-linux-ubsan bot.

Removed:
    cfe/trunk/test/CodeGenCXX/ubsan-check-debuglocs.cpp
Modified:
    cfe/trunk/lib/CodeGen/CGExpr.cpp

Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=344961&r1=344960&r2=344961&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Mon Oct 22 14:51:58 2018
@@ -2867,9 +2867,6 @@ static void emitCheckHandlerCall(CodeGen
                                  CheckRecoverableKind RecoverKind, bool IsFatal,
                                  llvm::BasicBlock *ContBB) {
   assert(IsFatal || RecoverKind != CheckRecoverableKind::Unrecoverable);
-  auto *DI = CGF.getDebugInfo();
-  SourceLocation Loc = DI ? DI->getLocation() : SourceLocation();
-  auto DL = ApplyDebugLocation::CreateDefaultArtificial(CGF, Loc);
   bool NeedsAbortSuffix =
       IsFatal && RecoverKind != CheckRecoverableKind::Unrecoverable;
   bool MinimalRuntime = CGF.CGM.getCodeGenOpts().SanitizeMinimalRuntime;

Removed: cfe/trunk/test/CodeGenCXX/ubsan-check-debuglocs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/ubsan-check-debuglocs.cpp?rev=344960&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/ubsan-check-debuglocs.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/ubsan-check-debuglocs.cpp (removed)
@@ -1,17 +0,0 @@
-// RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited \
-// RUN:   -fsanitize=null %s -o - | FileCheck %s
-
-// Check that santizer check calls have a !dbg location.
-// CHECK: define {{.*}}acquire{{.*}} !dbg
-// CHECK-NOT: define
-// CHECK: call void {{.*}}@__ubsan_handle_type_mismatch_v1
-// CHECK-SAME: !dbg
-
-struct SourceLocation {
-  SourceLocation acquire() {};
-};
-extern "C" void __ubsan_handle_type_mismatch_v1(SourceLocation *Loc);
-static void handleTypeMismatchImpl(SourceLocation *Loc) { Loc->acquire(); }
-void __ubsan_handle_type_mismatch_v1(SourceLocation *Loc) {
-  handleTypeMismatchImpl(Loc);
-}