Further cleanup

Author: naveen-seth

clang/include/clang/Frontend/StandaloneDiagnostic.h

@@ -14,13 +14,8 @@
 #ifndef LLVM_CLANG_FRONTEND_STANDALONEDIAGNOSTICS_H
 #define LLVM_CLANG_FRONTEND_STANDALONEDIAGNOSTICS_H
 
-#include "clang/Basic/DiagnosticIDs.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/SourceLocation.h"
+#include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/Basic/Specifiers.h"
-#include "llvm/ADT/StringExtras.h"
-#include <cassert>
 #include <string>
 #include <vector>
 
@@ -67,15 +62,23 @@ struct StandaloneDiagnostic {
   std::vector<StandaloneFixIt> FixIts;
 };
 
-/// Translates \c StandaloneDiag into a StoredDiagnostic, associating it with
-/// the provided FileManager and SourceManager.
+/// Translates all StandaloneDiagnostics in \p InDiags into StoredDiagnostics,
+/// associating them with the given FileManager and SourceManager.
 ///
-/// This allows the diagnostic to be emitted using the diagnostics engine, since
-/// StandaloneDiagnostics themselfs cannot be emitted directly.
-StoredDiagnostic
-translateStandaloneDiag(FileManager &FileMgr, SourceManager &SrcMgr,
-                        const StandaloneDiagnostic &StandaloneDiag,
-                        llvm::StringMap<SourceLocation> &SrcLocCache);
+/// This enables the diagnostics to be emitted through the diagnostics engine,
+/// since StandaloneDiagnostics cannot be emitted directly.
+///
+/// \param FileMgr The FileManager for the translated diagnostics.
+/// \param SrcMgr The SourceManager for the translated diagnostics.
+/// \param InDiags The input collection of StandaloneDiagnostics to translate.
+/// \param OutDiags The output list of resulting StoredDiagnostics.
+/// \param SrcLocCache Cache mapping filenames to source locations to speed up
+/// translation.
+void translateStandaloneDiagnostics(
+    FileManager &FileMgr, SourceManager &SrcMgr,
+    llvm::SmallVectorImpl<StandaloneDiagnostic> &&InDiags,
+    llvm::SmallVectorImpl<StoredDiagnostic> &OutDiags,
+    llvm::StringMap<SourceLocation> &SrcLocCache);
 
 } // namespace clang
 

clang/lib/Frontend/ASTUnit.cpp

@@ -1222,17 +1222,11 @@ bool ASTUnit::Parse(std::shared_ptr<PCHContainerOperations> PCHContainerOps,
   if (!Act->BeginSourceFile(*Clang, Clang->getFrontendOpts().Inputs[0]))
     return true;
 
-  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);
-                    });
-  } else
+  if (SavedMainFileBuffer)
+    translateStandaloneDiagnostics(getFileManager(), getSourceManager(),
+                                   std::move(PreambleDiagnostics),
+                                   StoredDiagnostics, PreambleSrcLocCache);
+  else
     PreambleSrcLocCache.clear();
 
   if (llvm::Error Err = Act->Execute()) {

clang/lib/Frontend/StandaloneDiagnostic.cpp

@@ -53,19 +53,19 @@ StandaloneDiagnostic::StandaloneDiagnostic(const LangOptions &LangOpts,
     FixIts.emplace_back(SrcMgr, LangOpts, FixIt);
 }
 
-StoredDiagnostic
-translateStandaloneDiag(FileManager &FileMgr, SourceManager &SrcMgr,
-                        const StandaloneDiagnostic &StandaloneDiag,
-                        llvm::StringMap<SourceLocation> &SrcLocCache) {
+static StoredDiagnostic
+translateStandaloneDiagnostic(FileManager &FileMgr, SourceManager &SrcMgr,
+                              StandaloneDiagnostic &&StandaloneDiag,
+                              llvm::StringMap<SourceLocation> &SrcLocCache) {
   const auto FileRef = FileMgr.getOptionalFileRef(StandaloneDiag.Filename);
   if (!FileRef)
     return StoredDiagnostic(StandaloneDiag.Level, StandaloneDiag.ID,
-                            StandaloneDiag.Message);
+                            std::move(StandaloneDiag.Message));
 
   // Try to get FileLoc from cache first
   SourceLocation FileLoc;
-  auto It = SrcLocCache.find(StandaloneDiag.Filename);
-  if (It != SrcLocCache.end()) {
+  if (const auto It = SrcLocCache.find(StandaloneDiag.Filename);
+      It != SrcLocCache.end()) {
     FileLoc = It->getValue();
   }
 
@@ -95,23 +95,34 @@ translateStandaloneDiag(FileManager &FileMgr, SourceManager &SrcMgr,
 
   SmallVector<CharSourceRange, 4> TranslatedRanges;
   TranslatedRanges.reserve(StandaloneDiag.Ranges.size());
-  transform(StandaloneDiag.Ranges, std::back_inserter(TranslatedRanges),
-            ConvertOffsetRange);
+  for (const auto &Range : StandaloneDiag.Ranges)
+    TranslatedRanges.push_back(ConvertOffsetRange(Range));
 
   SmallVector<FixItHint, 2> TranslatedFixIts;
   TranslatedFixIts.reserve(StandaloneDiag.FixIts.size());
-  for (const auto &FixIt : StandaloneDiag.FixIts) {
-    FixItHint TranslatedFixIt;
-    TranslatedFixIt.CodeToInsert = FixIt.CodeToInsert;
+  for (auto &FixIt : StandaloneDiag.FixIts) {
+    auto &TranslatedFixIt = TranslatedFixIts.emplace_back();
+    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);
+}
+
+void translateStandaloneDiagnostics(
+    FileManager &FileMgr, SourceManager &SrcMgr,
+    llvm::SmallVectorImpl<StandaloneDiagnostic> &&InDiags,
+    llvm::SmallVectorImpl<StoredDiagnostic> &OutDiags,
+    llvm::StringMap<SourceLocation> &SrcLocCache) {
+  InDiags.clear();
+  InDiags.reserve(OutDiags.size());
+  for (auto &InDiag : InDiags)
+    OutDiags.push_back(translateStandaloneDiagnostic(
+        FileMgr, SrcMgr, std::move(InDiag), SrcLocCache));
 }
 
 } // namespace clang