diff options
Diffstat (limited to 'clang/lib/Tooling/Refactoring.cpp')
| -rw-r--r-- | clang/lib/Tooling/Refactoring.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Tooling/Refactoring.cpp b/clang/lib/Tooling/Refactoring.cpp index 8599f97..52daaeb 100644 --- a/clang/lib/Tooling/Refactoring.cpp +++ b/clang/lib/Tooling/Refactoring.cpp @@ -206,8 +206,9 @@ void deduplicate(std::vector<Replacement> &Replaces, if (ConflictRange.overlapsWith(Current)) { // Extend conflicted range ConflictRange = Range(ConflictRange.getOffset(), - Current.getOffset() + Current.getLength() - - ConflictRange.getOffset()); + std::max(ConflictRange.getLength(), + Current.getOffset() + Current.getLength() - + ConflictRange.getOffset())); ++ConflictLength; } else { if (ConflictLength > 1) |