diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h
index 95e39716f2e..c6e60802093 100644
--- a/include/llvm/BasicBlock.h
+++ b/include/llvm/BasicBlock.h
@@ -235,6 +235,10 @@ public:
   /// keeping loop information consistent, use the SplitBlock utility function.
   ///
   BasicBlock *splitBasicBlock(iterator I, const Twine &BBName = "");
+
+  /// hasAddressTaken - returns true if there are any uses of this basic block
+  /// other than direct branches, switches, etc. to it.
+  bool hasAddressTaken() const;
 };
 
 } // End llvm namespace
diff --git a/lib/VMCore/BasicBlock.cpp b/lib/VMCore/BasicBlock.cpp
index 50cf84c3fe6..ede2d124510 100644
--- a/lib/VMCore/BasicBlock.cpp
+++ b/lib/VMCore/BasicBlock.cpp
@@ -277,3 +277,12 @@ BasicBlock *BasicBlock::splitBasicBlock(iterator I, const Twine &BBName) {
   }
   return New;
 }
+
+/// hasAddressTaken - returns true if there are any uses of this basic block
+/// other than direct branches, switches, etc. to it.
+bool BasicBlock::hasAddressTaken() const {
+  for (Value::use_const_iterator I = use_begin(), E = use_end(); I != E; ++I)
+    if (isa<BlockAddress>(*I))
+      return true;
+  return false;
+}