From 232bf3f19ad64866774ba4d448ae07f555f133d8 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Fri, 28 Apr 2017 00:25:06 +0000 Subject: [PATCH] [ARCMigrate] When applying changes from remap files, disable the 'adjustRemovals' functionality of EditedSource 'adjustRemovals' is used to avoid situation when removing a range inadvertently causes 2 separate identifiers to get joined into one. But it is not useful when the edits are character precise, as is the case with the remap files. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@301602 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Edit/EditedSource.h | 2 +- lib/ARCMigrate/ObjCMT.cpp | 2 +- lib/Edit/EditedSource.cpp | 14 +++++++++----- test/ARCMT/remap-applying.c | 4 ++++ test/ARCMT/remap-applying.c.result | 4 ++++ 5 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 test/ARCMT/remap-applying.c create mode 100644 test/ARCMT/remap-applying.c.result diff --git a/include/clang/Edit/EditedSource.h b/include/clang/Edit/EditedSource.h index b6ec8b8f06..b082e4e0a3 100644 --- a/include/clang/Edit/EditedSource.h +++ b/include/clang/Edit/EditedSource.h @@ -65,7 +65,7 @@ public: bool commit(const Commit &commit); - void applyRewrites(EditsReceiver &receiver); + void applyRewrites(EditsReceiver &receiver, bool adjustRemovals = true); void clearRewrites(); StringRef copyString(StringRef str) { return str.copy(StrAlloc); } diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp index 241a7246b6..fcc67da1f7 100644 --- a/lib/ARCMigrate/ObjCMT.cpp +++ b/lib/ARCMigrate/ObjCMT.cpp @@ -2189,7 +2189,7 @@ static std::string applyEditsToTemp(const FileEntry *FE, Rewriter rewriter(SM, LangOpts); RewritesReceiver Rec(rewriter); - Editor.applyRewrites(Rec); + Editor.applyRewrites(Rec, /*adjustRemovals=*/false); const RewriteBuffer *Buf = rewriter.getRewriteBufferFor(FID); SmallString<512> NewText; diff --git a/lib/Edit/EditedSource.cpp b/lib/Edit/EditedSource.cpp index 5292a58a9c..1a7a68cffb 100644 --- a/lib/Edit/EditedSource.cpp +++ b/lib/Edit/EditedSource.cpp @@ -363,13 +363,14 @@ static void adjustRemoval(const SourceManager &SM, const LangOptions &LangOpts, static void applyRewrite(EditsReceiver &receiver, StringRef text, FileOffset offs, unsigned len, - const SourceManager &SM, const LangOptions &LangOpts) { + const SourceManager &SM, const LangOptions &LangOpts, + bool shouldAdjustRemovals) { assert(offs.getFID().isValid()); SourceLocation Loc = SM.getLocForStartOfFile(offs.getFID()); Loc = Loc.getLocWithOffset(offs.getOffset()); assert(Loc.isFileID()); - if (text.empty()) + if (text.empty() && shouldAdjustRemovals) adjustRemoval(SM, LangOpts, Loc, offs, len, text); CharSourceRange range = CharSourceRange::getCharRange(Loc, @@ -387,7 +388,8 @@ static void applyRewrite(EditsReceiver &receiver, receiver.insert(Loc, text); } -void EditedSource::applyRewrites(EditsReceiver &receiver) { +void EditedSource::applyRewrites(EditsReceiver &receiver, + bool shouldAdjustRemovals) { SmallString<128> StrVec; FileOffset CurOffs, CurEnd; unsigned CurLen; @@ -414,14 +416,16 @@ void EditedSource::applyRewrites(EditsReceiver &receiver) { continue; } - applyRewrite(receiver, StrVec, CurOffs, CurLen, SourceMgr, LangOpts); + applyRewrite(receiver, StrVec, CurOffs, CurLen, SourceMgr, LangOpts, + shouldAdjustRemovals); CurOffs = offs; StrVec = act.Text; CurLen = act.RemoveLen; CurEnd = CurOffs.getWithOffset(CurLen); } - applyRewrite(receiver, StrVec, CurOffs, CurLen, SourceMgr, LangOpts); + applyRewrite(receiver, StrVec, CurOffs, CurLen, SourceMgr, LangOpts, + shouldAdjustRemovals); } void EditedSource::clearRewrites() { diff --git a/test/ARCMT/remap-applying.c b/test/ARCMT/remap-applying.c new file mode 100644 index 0000000000..b6280bf938 --- /dev/null +++ b/test/ARCMT/remap-applying.c @@ -0,0 +1,4 @@ +a bc + +// RUN: echo "[{\"file\": \"%s\", \"offset\": 1, \"remove\": 2, }]" > %t.remap +// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result diff --git a/test/ARCMT/remap-applying.c.result b/test/ARCMT/remap-applying.c.result new file mode 100644 index 0000000000..975dc9e431 --- /dev/null +++ b/test/ARCMT/remap-applying.c.result @@ -0,0 +1,4 @@ +ac + +// RUN: echo "[{\"file\": \"%s\", \"offset\": 1, \"remove\": 2, }]" > %t.remap +// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result -- 2.40.0