Index: llvm/trunk/lib/Transforms/IPO/LowerTypeTests.cpp
===================================================================
--- llvm/trunk/lib/Transforms/IPO/LowerTypeTests.cpp
+++ llvm/trunk/lib/Transforms/IPO/LowerTypeTests.cpp
@@ -983,7 +983,7 @@
   if (F->isWeakForLinker())
     replaceWeakDeclarationWithJumpTablePtr(F, FDecl);
   else
-    F->replaceAllUsesWith(FDecl);
+    F->replaceUsesExceptBlockAddr(FDecl);
 }
 
 void LowerTypeTestsModule::lowerTypeTestCalls(
Index: llvm/trunk/test/Transforms/LowerTypeTests/Inputs/blockaddr-import.yaml
===================================================================
--- llvm/trunk/test/Transforms/LowerTypeTests/Inputs/blockaddr-import.yaml
+++ llvm/trunk/test/Transforms/LowerTypeTests/Inputs/blockaddr-import.yaml
@@ -0,0 +1,10 @@
+---
+TypeIdMap:
+  typeid1:
+    TTRes:
+      Kind:            AllOnes
+      SizeM1BitWidth:  7
+CfiFunctionDefs:
+  - m
+CfiFunctionDecls:
+...
Index: llvm/trunk/test/Transforms/LowerTypeTests/blockaddr-import.ll
===================================================================
--- llvm/trunk/test/Transforms/LowerTypeTests/blockaddr-import.ll
+++ llvm/trunk/test/Transforms/LowerTypeTests/blockaddr-import.ll
@@ -0,0 +1,22 @@
+; RUN: opt -lowertypetests -lowertypetests-summary-action=import -lowertypetests-read-summary=%p/Inputs/blockaddr-import.yaml %s -S | FileCheck %s
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux"
+
+declare i1 @llvm.type.test(i8*, metadata) #1
+declare !type !11 i32 @o(...)
+
+define hidden void @m() #0 !type !3 {
+entry:
+  br label %n
+n:
+  %call = tail call i32 (i8*, ...) bitcast (i32 (...)* @o to i32 (i8*, ...)*)(i8* blockaddress(@m, %n)) #4
+; Make sure that blockaddress refers to the new function, m.cfi
+; CHECK: define hidden void @m.cfi()
+; CHECK: blockaddress(@m.cfi, %n)
+
+  ret void
+}
+
+!3 = !{i64 0, !"_ZTSFvE"}
+!11 = !{i64 0, !"_ZTSFiE"}