diff --git a/llvm/lib/VMCore/Verifier.cpp b/llvm/lib/VMCore/Verifier.cpp
index 06eccc0ba45b..fc90148b8b5a 100644
--- a/llvm/lib/VMCore/Verifier.cpp
+++ b/llvm/lib/VMCore/Verifier.cpp
@@ -658,6 +658,8 @@ void Verifier::visitFunction(Function &F) {
     BasicBlock *Entry = &F.getEntryBlock();
     Assert1(pred_begin(Entry) == pred_end(Entry),
             "Entry block to function must not have predecessors!", Entry);
+    Assert1(!Entry->hasAddressTaken(),
+            "blockaddress may not be used with the entry block!", Entry);
   }
   
   // If this function is actually an intrinsic, verify that it is only used in