diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp
index f8dd0823902..30f3715b08e 100644
--- a/lib/IR/Verifier.cpp
+++ b/lib/IR/Verifier.cpp
@@ -2579,15 +2579,6 @@ void Verifier::verifyCallSite(CallSite CS) {
     }
   }
 
-  // Verify that each inlinable callsite of a debug-info-bearing function in a
-  // debug-info-bearing function has a debug location attached to it. Failure to
-  // do so causes assertion failures when the inliner sets up inline scope info.
-  if (I->getFunction()->getSubprogram() && CS.getCalledFunction() &&
-      CS.getCalledFunction()->getSubprogram())
-    Assert(I->getDebugLoc(), "inlinable function call in a function with debug "
-                             "info must have a !dbg location",
-           I);
-
   visitInstruction(*I);
 }
 
diff --git a/test/DebugInfo/X86/arange-and-stub.ll b/test/DebugInfo/X86/arange-and-stub.ll
index 891429e3ef1..668ea9c3a0b 100644
--- a/test/DebugInfo/X86/arange-and-stub.ll
+++ b/test/DebugInfo/X86/arange-and-stub.ll
@@ -18,7 +18,7 @@ define void @foo() !dbg !4 {
 
 define void @bar() personality i8* bitcast (void ()* @foo to i8*) !dbg !9 {
   invoke void @foo()
-          to label %invoke.cont unwind label %lpad, !dbg !19
+          to label %invoke.cont unwind label %lpad
 
 invoke.cont:                                      ; preds = %0
   ret void
@@ -50,4 +50,3 @@ lpad:                                             ; preds = %0
 !16 = !DISubrange(count: 1)
 !17 = !{i32 2, !"Dwarf Version", i32 4}
 !18 = !{i32 2, !"Debug Info Version", i32 3}
-!19 = !DILocation(line: 0, scope: !9)
diff --git a/test/DebugInfo/X86/dbg-declare-arg.ll b/test/DebugInfo/X86/dbg-declare-arg.ll
index 7fd6296c7ee..c2a652c7266 100644
--- a/test/DebugInfo/X86/dbg-declare-arg.ll
+++ b/test/DebugInfo/X86/dbg-declare-arg.ll
@@ -54,7 +54,7 @@ entry:
   store %class.A* %this, %class.A** %this.addr, align 8
   call void @llvm.dbg.declare(metadata %class.A** %this.addr, metadata !43, metadata !DIExpression()), !dbg !44
   %this1 = load %class.A*, %class.A** %this.addr
-  call void @_ZN1AD2Ev(%class.A* %this1), !dbg !53
+  call void @_ZN1AD2Ev(%class.A* %this1)
   ret void, !dbg !45
 }
 
@@ -124,4 +124,3 @@ entry:
 !49 = distinct !DILexicalBlock(line: 2, column: 52, file: !51, scope: !25)
 !51 = !DIFile(filename: "a.cc", directory: "/private/tmp")
 !52 = !{i32 1, !"Debug Info Version", i32 3}
-!53 = !DILocation(line: 0, scope: !22)
diff --git a/test/Verifier/callsite-dbgloc.ll b/test/Verifier/callsite-dbgloc.ll
deleted file mode 100644
index 2e7473917ec..00000000000
--- a/test/Verifier/callsite-dbgloc.ll
+++ /dev/null
@@ -1,62 +0,0 @@
-; RUN: not llvm-as %s -o %t 2>&1 | FileCheck %s
-; Created and then edited from
-;   extern void i();
-;   void h() { i(); }
-;   void g() { h(); }
-;   void f() { g(); }
-;
-; Compiling this with inlining runs into the
-; "!dbg attachment points at wrong subprogram for function"
-; assertion.
-
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx"
-
-; Function Attrs: nounwind ssp uwtable
-define void @h() #0 !dbg !7 {
-entry:
-  call void (...) @i(), !dbg !9
-  ret void, !dbg !10
-}
-
-declare void @i(...) #1
-
-; Function Attrs: nounwind ssp uwtable
-define void @g() #0 !dbg !11 {
-entry:
-; Manually removed !dbg.
-; CHECK: inlinable function call in a function with debug info must have a !dbg location
-  call void @h()
-  ret void, !dbg !13
-}
-
-; Function Attrs: nounwind ssp uwtable
-define void @f() #0 !dbg !14 {
-entry:
-  call void @g(), !dbg !15
-  ret void, !dbg !16
-}
-
-attributes #0 = { nounwind ssp uwtable }
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!3, !4, !5}
-!llvm.ident = !{!6}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.9.0 (trunk 267186)", isOptimized: false, runtimeVersion: 0, emissionKind: LineTablesOnly, enums: !2)
-!1 = !DIFile(filename: "test.c", directory: "/Volumes/Data/llvm")
-!2 = !{}
-!3 = !{i32 2, !"Dwarf Version", i32 2}
-!4 = !{i32 2, !"Debug Info Version", i32 3}
-!5 = !{i32 1, !"PIC Level", i32 2}
-!6 = !{!"clang version 3.9.0 (trunk 267186)"}
-!7 = distinct !DISubprogram(name: "h", scope: !1, file: !1, line: 2, type: !8, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: false, unit: !0, variables: !2)
-!8 = !DISubroutineType(types: !2)
-!9 = !DILocation(line: 2, column: 12, scope: !7)
-!10 = !DILocation(line: 2, column: 17, scope: !7)
-!11 = distinct !DISubprogram(name: "g", scope: !1, file: !1, line: 3, type: !8, isLocal: false, isDefinition: true, scopeLine: 3, isOptimized: false, unit: !0, variables: !2)
-!12 = !DILocation(line: 3, column: 12, scope: !11)
-!13 = !DILocation(line: 3, column: 17, scope: !11)
-!14 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 4, type: !8, isLocal: false, isDefinition: true, scopeLine: 4, isOptimized: false, unit: !0, variables: !2)
-!15 = !DILocation(line: 4, column: 12, scope: !14)
-!16 = !DILocation(line: 4, column: 17, scope: !14)