fix nits

Author: cyndyishida

clang/include/clang/Serialization/ASTReader.h

@@ -238,13 +238,14 @@ class ASTReaderListener {
   }
 
   /// Overloaded member function of \c visitInputFile that should
-  /// be defined when the input file contains both the virtual and external
-  /// paths, for example when deserializing input files from AST files.
+  /// be defined when there is a distinction between
+  /// the file name and name-as-requested. For example, when deserializing input
+  /// files from precompiled AST files.
   ///
   /// \returns true to continue receiving the next input file, false to stop.
-  virtual bool visitInputFile(StringRef FilenameAsRequested,
-                              StringRef ExternalFilename, bool isSystem,
-                              bool isOverridden, bool isExplicitModule) {
+  virtual bool visitInputFile(StringRef FilenameAsRequested, StringRef Filename,
+                              bool isSystem, bool isOverridden,
+                              bool isExplicitModule) {
     return true;
   }
 

clang/lib/Frontend/FrontendActions.cpp

@@ -777,9 +777,9 @@ namespace {
     /// Indicates that the AST file contains particular input file.
     ///
     /// \returns true to continue receiving the next input file, false to stop.
-    bool visitInputFile(StringRef FilenameAsRequested,
-                        StringRef ExternalFilename, bool isSystem,
-                        bool isOverridden, bool isExplicitModule) override {
+    bool visitInputFile(StringRef FilenameAsRequested, StringRef Filename,
+                        bool isSystem, bool isOverridden,
+                        bool isExplicitModule) override {
 
       Out.indent(2) << "Input file: " << FilenameAsRequested;
 

clang/lib/Serialization/ASTReader.cpp

@@ -2616,18 +2616,14 @@ bool ASTReader::shouldDisableValidationForFile(
   return false;
 }
 
-namespace {
-
-std::pair<StringRef, StringRef>
+static std::pair<StringRef, StringRef>
 getUnresolvedInputFilenames(const ASTReader::RecordData &Record,
                             const StringRef InputBlob) {
   uint16_t AsRequestedLength = Record[7];
   return {InputBlob.substr(0, AsRequestedLength),
           InputBlob.substr(AsRequestedLength)};
 }
 
-} // namespace
-
 InputFileInfo ASTReader::getInputFileInfo(ModuleFile &F, unsigned ID) {
   // If this ID is bogus, just return an empty input file.
   if (ID == 0 || ID > F.InputFileInfosLoaded.size())

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

@@ -116,39 +116,43 @@ class PrebuiltModuleListener : public ASTReaderListener {
     if (PrebuiltModuleFiles.insert({ModuleName.str(), Filename.str()}).second)
       NewModuleFiles.push_back(Filename.str());
 
-    if (PrebuiltModulesASTMap.try_emplace(Filename).second)
-      PrebuiltModulesASTMap[Filename].setInStableDir(!StableDirs.empty());
+    auto PrebuiltMapEntry = PrebuiltModulesASTMap.try_emplace(Filename);
+    PrebuiltModuleASTAttrs &PrebuiltModule = PrebuiltMapEntry.first->second;
+    if (PrebuiltMapEntry.second)
+      PrebuiltModule.setInStableDir(!StableDirs.empty());
 
     if (auto It = PrebuiltModulesASTMap.find(CurrentFile);
         It != PrebuiltModulesASTMap.end() && CurrentFile != Filename)
-      PrebuiltModulesASTMap[Filename].addDependent(It->getKey());
+      PrebuiltModule.addDependent(It->getKey());
   }
 
   /// For each input file discovered, check whether it's external path is in a
   /// stable directory. Traversal is stopped if the current module is not
   /// considered stable.
-  bool visitInputFile(StringRef FilenameAsRequested, StringRef ExternalFilename,
+  bool visitInputFile(StringRef FilenameAsRequested, StringRef Filename,
                       bool isSystem, bool isOverridden,
                       bool isExplicitModule) override {
     if (StableDirs.empty())
       return false;
-    if (!PrebuiltModulesASTMap.contains(CurrentFile) ||
-        !PrebuiltModulesASTMap[CurrentFile].isInStableDir())
+    auto PrebuiltEntryIt = PrebuiltModulesASTMap.find(CurrentFile);
+    if ((PrebuiltEntryIt == PrebuiltModulesASTMap.end()) ||
+        (!PrebuiltEntryIt->second.isInStableDir()))
       return false;
 
-    PrebuiltModulesASTMap[CurrentFile].setInStableDir(
-        isPathInStableDir(StableDirs, ExternalFilename));
-    return PrebuiltModulesASTMap[CurrentFile].isInStableDir();
+    PrebuiltEntryIt->second.setInStableDir(
+        isPathInStableDir(StableDirs, Filename));
+    return PrebuiltEntryIt->second.isInStableDir();
   }
 
   /// Update which module that is being actively traversed.
   void visitModuleFile(StringRef Filename,
                        serialization::ModuleKind Kind) override {
     // If the CurrentFile is not
     // considered stable, update any of it's transitive dependents.
-    if (PrebuiltModulesASTMap.contains(CurrentFile) &&
-        !PrebuiltModulesASTMap[CurrentFile].isInStableDir())
-      PrebuiltModulesASTMap[CurrentFile].updateDependentsNotInStableDirs(
+    auto PrebuiltEntryIt = PrebuiltModulesASTMap.find(CurrentFile);
+    if ((PrebuiltEntryIt != PrebuiltModulesASTMap.end()) &&
+        !PrebuiltEntryIt->second.isInStableDir())
+      PrebuiltEntryIt->second.updateDependentsNotInStableDirs(
           PrebuiltModulesASTMap);
     CurrentFile = Filename;
   }
@@ -159,12 +163,14 @@ class PrebuiltModuleListener : public ASTReaderListener {
                                StringRef ModuleFilename,
                                StringRef SpecificModuleCachePath,
                                bool Complain) override {
-    if (PrebuiltModulesASTMap.try_emplace(CurrentFile).second)
-      PrebuiltModulesASTMap[CurrentFile].setInStableDir(!StableDirs.empty());
 
-    if (PrebuiltModulesASTMap[CurrentFile].isInStableDir())
-      PrebuiltModulesASTMap[CurrentFile].setInStableDir(
-          areOptionsInStableDir(StableDirs, HSOpts));
+    auto PrebuiltMapEntry = PrebuiltModulesASTMap.try_emplace(CurrentFile);
+    PrebuiltModuleASTAttrs &PrebuiltModule = PrebuiltMapEntry.first->second;
+    if (PrebuiltMapEntry.second)
+      PrebuiltModule.setInStableDir(!StableDirs.empty());
+
+    if (PrebuiltModule.isInStableDir())
+      PrebuiltModule.setInStableDir(areOptionsInStableDir(StableDirs, HSOpts));
 
     return false;
   }
@@ -173,10 +179,12 @@ class PrebuiltModuleListener : public ASTReaderListener {
   bool ReadHeaderSearchPaths(const HeaderSearchOptions &HSOpts,
                              bool Complain) override {
 
-    if (PrebuiltModulesASTMap.try_emplace(CurrentFile).second)
-      PrebuiltModulesASTMap[CurrentFile].setInStableDir(!StableDirs.empty());
+    auto PrebuiltMapEntry = PrebuiltModulesASTMap.try_emplace(CurrentFile);
+    PrebuiltModuleASTAttrs &PrebuiltModule = PrebuiltMapEntry.first->second;
+    if (PrebuiltMapEntry.second)
+      PrebuiltModule.setInStableDir(!StableDirs.empty());
 
-    PrebuiltModulesASTMap[CurrentFile].setVFS(
+    PrebuiltModule.setVFS(
         llvm::StringSet<>(llvm::from_range, HSOpts.VFSOverlayFiles));
 
     return checkHeaderSearchPaths(