prehistoric-penguin updated this revision to Diff 449570. prehistoric-penguin added a comment.
Update commit message Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D131046/new/ https://reviews.llvm.org/D131046 Files: clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp Index: clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp =================================================================== --- clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp +++ clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp @@ -135,12 +135,11 @@ if (auto Entry = SM.getFileManager().getFile(R.getFilePath())) { if (SourceTU) { auto &Replaces = DiagReplacements[*Entry]; - auto It = Replaces.find(R); - if (It == Replaces.end()) - Replaces.emplace(R, SourceTU); - else if (It->second != SourceTU) - // This replacement is a duplicate of one suggested by another TU. + auto InsertPos = Replaces.try_emplace(R, SourceTU); + // This replacement is a duplicate of one suggested by another TU. + if (!InsertPos.second && InsertPos.first->second != SourceTU) { return; + } } GroupedReplacements[*Entry].push_back(R); } else if (Warned.insert(R.getFilePath()).second) {
Index: clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp =================================================================== --- clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp +++ clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp @@ -135,12 +135,11 @@ if (auto Entry = SM.getFileManager().getFile(R.getFilePath())) { if (SourceTU) { auto &Replaces = DiagReplacements[*Entry]; - auto It = Replaces.find(R); - if (It == Replaces.end()) - Replaces.emplace(R, SourceTU); - else if (It->second != SourceTU) - // This replacement is a duplicate of one suggested by another TU. + auto InsertPos = Replaces.try_emplace(R, SourceTU); + // This replacement is a duplicate of one suggested by another TU. + if (!InsertPos.second && InsertPos.first->second != SourceTU) { return; + } } GroupedReplacements[*Entry].push_back(R); } else if (Warned.insert(R.getFilePath()).second) {
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits