Bug fix in RewriteBuffer::getMappedOffset: potentially multiple deltas

need to be skipped over when AfterInserts == true, as multiple deltas
may share the same FileLoc.

llvm-svn: 48503

1 files changed, 6 insertions, 4 deletions

diff --git a/clang/lib/Rewrite/Rewriter.cpp b/clang/lib/Rewrite/Rewriter.cpp
index 440d1d39fd5..e3cc977bea3 100644
--- a/clang/lib/Rewrite/Rewriter.cpp
+++ b/clang/lib/Rewrite/Rewriter.cpp
@@ -32,10 +32,12 @@ unsigned RewriteBuffer::getMappedOffset(unsigned OrigOffset,
   for (; DeltaIdx != Deltas.size() && 
        Deltas[DeltaIdx].FileLoc < OrigOffset; ++DeltaIdx)
     ResultOffset += Deltas[DeltaIdx].Delta;
-
-  if (AfterInserts && DeltaIdx != Deltas.size() && 
-      OrigOffset == Deltas[DeltaIdx].FileLoc)
-    ResultOffset += Deltas[DeltaIdx].Delta;
+  
+  if (AfterInserts)
+    for (; DeltaIdx != Deltas.size() &&
+         OrigOffset == Deltas[DeltaIdx].FileLoc; ++DeltaIdx)
+      ResultOffset += Deltas[DeltaIdx].Delta;
+  
   return ResultOffset;
 }