maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Trying to buildbot failures caused by r282577. 

llvm-svn: 282583
This commit is contained in:
Eric Liu 2016-09-28 12:49:14 +00:00
parent b3587836bc
commit dd7faec9ca
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Tooling/Core/Replacement.cpp
View File

@ -287,8 +287,13 @@ llvm::Error Replacements::add(const Replacement &R) {
// with them and replace them with the merged replacements.
auto MergeBegin = I;
auto MergeEnd = std::next(I);
while (I-- != Replaces.begin() && Overlap(R, *I))
while (I != Replaces.begin()) {
--I;
// If `I` doesn't overlap with `R`, don't merge it.
if (!Overlap(R, *I))
break;
MergeBegin = I;
}
Replacements OverlapReplaces(MergeBegin, MergeEnd);
llvm::Expected<Replacements> Merged =
OverlapReplaces.mergeIfOrderIndependent(R);