Fix rdar://5919567: assertion failure: split didn't occur before erase!

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

diff --git a/lib/Rewrite/RewriteRope.cpp b/lib/Rewrite/RewriteRope.cpp
index 7ee9fcced242aaef444ecd349dfae639dc1c2e21..9d5d7a741053f468df7d3f74586602346a290f80 100644 (file)
--- a/lib/Rewrite/RewriteRope.cpp
+++ b/lib/Rewrite/RewriteRope.cpp
@@ -567,10 +567,12 @@ void RopePieceBTreeInterior::erase(unsigned Offset, unsigned NumBytes) {
       unsigned BytesFromChild = CurChild->size()-Offset;
       CurChild->erase(Offset, BytesFromChild);
       NumBytes -= BytesFromChild;
+      // Start at the beginning of the next child.
+      Offset = 0;
       ++i;
       continue;
     }
-    
+
     // If the deletion request completely covers the child, delete it and move
     // the rest down.
     NumBytes -= CurChild->size();