When unifying instructions during a block diff, actually complain about

any differences we see.  This should only happen if there are "non-structural"
differences between the instructions, i.e. differences which wouldn't cause
diff to return true.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@109742 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvm-diff/DifferenceEngine.cpp b/tools/llvm-diff/DifferenceEngine.cpp
index 769dc0ac10351759f7c60f0886a23dd8d1b21553..d9fbc57d2d710575f98af2dfe519d803c318b78e 100644 (file)
--- a/tools/llvm-diff/DifferenceEngine.cpp
+++ b/tools/llvm-diff/DifferenceEngine.cpp
@@ -549,7 +549,7 @@ void FunctionDifferenceEngine::runBlockDiff(BasicBlock::iterator LStart,
       {
         Instruction *L = &*LI, *R = &*RI;
         DifferenceEngine::Context C(Engine, L, R);
-        diff(L, R, false, true); // unify successors
+        diff(L, R, true, true); // complain and unify successors
         Values[L] = R; // make non-tentative
         Diff.addMatch(L, R);
       }