diff --git a/docs/Passes.html b/docs/Passes.html
index 3492a279709..a01b754d70d 100644
--- a/docs/Passes.html
+++ b/docs/Passes.html
@@ -1864,7 +1864,7 @@ if (i == j)
The code is in valid SSA form.
It should be illegal to put a label into any other type (like a
structure) or to return one. [except constant arrays!]
- Only phi nodes can be self referential: %x = add int %x, %x is
+ Only phi nodes can be self referential: %x = add i32 %x, %x is
invalid.
PHI nodes must have an entry for each predecessor, with no extras.
PHI nodes must be the first thing in a basic block, all grouped
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index 4ac8c0f3a48..7ec0cf3a458 100644
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -21,7 +21,7 @@
// * The code is in valid SSA form
// * It should be illegal to put a label into any other type (like a structure)
// or to return one. [except constant arrays!]
-// * Only phi nodes can be self referential: 'add int %0, %0 ; :0' is bad
+// * Only phi nodes can be self referential: 'add i32 %0, %0 ; :0' is bad
// * PHI nodes must have an entry for each predecessor, with no extras.
// * PHI nodes must be the first thing in a basic block, all grouped together
// * PHI nodes must have at least one entry
@@ -530,6 +530,12 @@ void Verifier::visitBasicBlock(BasicBlock &BB) {
// Ensure that basic blocks have terminators!
Assert1(BB.getTerminator(), "Basic Block does not have terminator!", &BB);
+ // Ensure that the BB doesn't point out of its Function for unwinding.
+ Assert2(!BB.getUnwindDest() ||
+ BB.getUnwindDest()->getParent() == BB.getParent(),
+ "Basic Block unwinds to block in different function!",
+ &BB, BB.getUnwindDest());
+
// Check constraints that this basic block imposes on all of the PHI nodes in
// it.
if (isa(BB.front())) {
@@ -1217,7 +1223,7 @@ void Verifier::visitInstruction(Instruction &I) {
}
// Definition must dominate use unless use is unreachable!
- Assert2(DT->dominates(OpBlock, BB) ||
+ Assert2(DT->dominates(Op, &I) ||
!DT->dominates(&BB->getParent()->getEntryBlock(), BB),
"Instruction does not dominate all uses!", Op, &I);
} else {