diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -459,6 +459,7 @@
   void visitModuleFlagCGProfileEntry(const MDOperand &MDO);
   void visitFunction(const Function &F);
   void visitBasicBlock(BasicBlock &BB);
+  void visitBlockAddress(const BlockAddress &BA);
   void visitRangeMetadata(Instruction &I, MDNode *Range, Type *Ty);
   void visitDereferenceableMetadata(Instruction &I, MDNode *MD);
   void visitProfMetadata(Instruction &I, MDNode *MD);
@@ -2729,8 +2730,31 @@
 
   // Check that all instructions have their parent pointers set up correctly.
   for (auto &I : BB)
-  {
     Assert(I.getParent() == &BB, "Instruction has bogus parent pointer!");
+
+  if (BlockAddress *BA = BlockAddress::lookup(&BB))
+    visitBlockAddress(*BA);
+}
+
+void Verifier::visitBlockAddress(const BlockAddress &BA) {
+  // Check the users of this BA.
+  Function *F = BA.getFunction();
+  // TODO: what about other linkages? isIterposableLinkage? isWeakForLinker?
+  if (!F->hasAvailableExternallyLinkage())
+    return;
+
+  // maybe use a set, too?
+  SmallVector<const User *, 4> Worklist(BA.user_begin(), BA.user_end());
+  while (!Worklist.empty()) {
+    const User *U = Worklist.pop_back_val();
+
+    Assert(!isa<GlobalValue>(U),
+           "BlockAddress refers to BasicBlock that will not be emitted");
+    if (isa<ConstantExpr>(U))
+      Worklist.append(U->user_begin(), U->user_end());
+    if (auto *I = dyn_cast<Instruction>(U))
+      Assert(I->getParent()->getParent() == F,
+             "BlockAddress refers to BasicBlock that will not be emitted");
   }
 }