From 01095a5d43bbfde13731688ddcf6048ebb8b7721 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 23 Jul 2016 20:41:05 +0000 Subject: Vendor import of llvm release_39 branch r276489: https://llvm.org/svn/llvm-project/llvm/branches/release_39@276489 --- tools/llvm-diff/DifferenceEngine.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'tools/llvm-diff/DifferenceEngine.cpp') diff --git a/tools/llvm-diff/DifferenceEngine.cpp b/tools/llvm-diff/DifferenceEngine.cpp index 456560b093ab..df208a26ab7d 100644 --- a/tools/llvm-diff/DifferenceEngine.cpp +++ b/tools/llvm-diff/DifferenceEngine.cpp @@ -16,7 +16,6 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSet.h" #include "llvm/IR/CFG.h" #include "llvm/IR/CallSite.h" @@ -210,7 +209,8 @@ class FunctionDifferenceEngine { if (!LeftI->use_empty()) TentativeValues.insert(std::make_pair(LeftI, RightI)); - ++LI, ++RI; + ++LI; + ++RI; } while (LI != LE); // This is sufficient: we can't get equality of // terminators if there are residual instructions. @@ -555,7 +555,9 @@ void FunctionDifferenceEngine::runBlockDiff(BasicBlock::iterator LStart, PI = Path.begin(), PE = Path.end(); while (PI != PE && *PI == DC_match) { unify(&*LI, &*RI); - ++PI, ++LI, ++RI; + ++PI; + ++LI; + ++RI; } for (; PI != PE; ++PI) { @@ -589,7 +591,8 @@ void FunctionDifferenceEngine::runBlockDiff(BasicBlock::iterator LStart, while (LI != LE) { assert(RI != RE); unify(&*LI, &*RI); - ++LI, ++RI; + ++LI; + ++RI; } // If the terminators have different kinds, but one is an invoke and the -- cgit v1.2.3