Skip to content

[clang][Frontend] Use move semantics when translating standalone diagnostics (NFC) #172746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
naveen-seth wants to merge 1 commit into from
Closed

[clang][Frontend] Use move semantics when translating standalone diagnostics (NFC) #172746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/include/clang/Frontend/StandaloneDiagnostic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ struct StandaloneDiagnostic {
/// StandaloneDiagnostics themselfs cannot be emitted directly.
StoredDiagnostic
translateStandaloneDiag(FileManager &FileMgr, SourceManager &SrcMgr,
const StandaloneDiagnostic &StandaloneDiag,
StandaloneDiagnostic StandaloneDiag,
llvm::StringMap<SourceLocation> &SrcLocCache);

} // namespace clang
Expand Down
12 changes: 5 additions & 7 deletions clang/lib/Frontend/ASTUnit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,13 +1225,11 @@ bool ASTUnit::Parse(std::shared_ptr<PCHContainerOperations> PCHContainerOps,
if (SavedMainFileBuffer) {
StoredDiagnostics.clear();
StoredDiagnostics.reserve(PreambleDiagnostics.size());
llvm::transform(std::move(PreambleDiagnostics),
std::back_inserter(StoredDiagnostics),
[&](auto &&StandaloneDiag) {
return translateStandaloneDiag(
getFileManager(), getSourceManager(),
std::move(StandaloneDiag), PreambleSrcLocCache);
});
for (auto &PreambleDiag : PreambleDiagnostics) {
StoredDiagnostics.push_back(translateStandaloneDiag(
getFileManager(), getSourceManager(), std::move(PreambleDiag),
PreambleSrcLocCache));
}
} else
PreambleSrcLocCache.clear();

Expand Down
12 changes: 6 additions & 6 deletions clang/lib/Frontend/StandaloneDiagnostic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ StandaloneDiagnostic::StandaloneDiagnostic(const LangOptions &LangOpts,

StoredDiagnostic
translateStandaloneDiag(FileManager &FileMgr, SourceManager &SrcMgr,
const StandaloneDiagnostic &StandaloneDiag,
StandaloneDiagnostic StandaloneDiag,
llvm::StringMap<SourceLocation> &SrcLocCache) {
const auto FileRef = FileMgr.getOptionalFileRef(StandaloneDiag.Filename);
if (!FileRef)
Expand All @@ -77,7 +77,7 @@ translateStandaloneDiag(FileManager &FileMgr, SourceManager &SrcMgr,

if (FileLoc.isInvalid())
return StoredDiagnostic(StandaloneDiag.Level, StandaloneDiag.ID,
StandaloneDiag.Message);
std::move(StandaloneDiag.Message));

SrcLocCache[StandaloneDiag.Filename] = FileLoc;
}
Expand All @@ -100,18 +100,18 @@ translateStandaloneDiag(FileManager &FileMgr, SourceManager &SrcMgr,

SmallVector<FixItHint, 2> TranslatedFixIts;
TranslatedFixIts.reserve(StandaloneDiag.FixIts.size());
for (const auto &FixIt : StandaloneDiag.FixIts) {
for (auto &FixIt : StandaloneDiag.FixIts) {
FixItHint TranslatedFixIt;
TranslatedFixIt.CodeToInsert = FixIt.CodeToInsert;
TranslatedFixIt.CodeToInsert = std::move(FixIt.CodeToInsert);
TranslatedFixIt.RemoveRange = ConvertOffsetRange(FixIt.RemoveRange);
TranslatedFixIt.InsertFromRange = ConvertOffsetRange(FixIt.InsertFromRange);
TranslatedFixIt.BeforePreviousInsertions = FixIt.BeforePreviousInsertions;
TranslatedFixIts.push_back(std::move(TranslatedFixIt));
}

return StoredDiagnostic(StandaloneDiag.Level, StandaloneDiag.ID,
StandaloneDiag.Message, Loc, TranslatedRanges,
TranslatedFixIts);
std::move(StandaloneDiag.Message), Loc,
TranslatedRanges, TranslatedFixIts);
}

} // namespace clang
Loading