summaryrefslogtreecommitdiffstats
path: root/clang/lib/Edit/EditedSource.cpp
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2012-05-14 22:01:53 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2012-05-14 22:01:53 +0000
commitc1dfed6572b58515747d59fce045cfdacf8a6b1c (patch)
tree6da1a7d0da848c1b1a3b4f01fde3c01a70faf63d /clang/lib/Edit/EditedSource.cpp
parentbb653bd5f95328a676ac80a2cfe33e26a6fcd7b8 (diff)
downloadbcm5719-llvm-c1dfed6572b58515747d59fce045cfdacf8a6b1c.tar.gz
bcm5719-llvm-c1dfed6572b58515747d59fce045cfdacf8a6b1c.zip
[objcmt] When rewriting to array/dictionary literals, add an explicit
cast to 'id' for any argument that requires it. Part of rdar://11438360. llvm-svn: 156782
Diffstat (limited to 'clang/lib/Edit/EditedSource.cpp')
-rw-r--r--clang/lib/Edit/EditedSource.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Edit/EditedSource.cpp b/clang/lib/Edit/EditedSource.cpp
index 5b7fa4ad1b6..b2a16635d05 100644
--- a/clang/lib/Edit/EditedSource.cpp
+++ b/clang/lib/Edit/EditedSource.cpp
@@ -100,8 +100,11 @@ bool EditedSource::commitInsertFromRange(SourceLocation OrigLoc,
FileOffset B = I->first;
FileOffset E = B.getWithOffset(FA.RemoveLen);
+ if (BeginOffs == B)
+ break;
+
if (BeginOffs < E) {
- if (BeginOffs >= B) {
+ if (BeginOffs > B) {
BeginOffs = E;
++I;
}
OpenPOWER on IntegriCloud