Remove OutputFileMap's Knowledge of Range Dependencies

Author: CodaFi

include/swift/Basic/OutputFileMap.h

@@ -46,12 +46,10 @@ class OutputFileMap {
   /// Loads an OutputFileMap from the given \p Path into the receiver, if
   /// possible.
   static llvm::Expected<OutputFileMap>
-  loadFromPath(StringRef Path, StringRef workingDirectory,
-               bool addEntriesForSourceRangeDependencies);
+  loadFromPath(StringRef Path, StringRef workingDirector);
 
   static llvm::Expected<OutputFileMap>
-  loadFromBuffer(StringRef Data, StringRef workingDirectory,
-                 bool addEntriesForSourceRangeDependencies);
+  loadFromBuffer(StringRef Data, StringRef workingDirectory);
 
   /// Loads an OutputFileMap from the given \p Buffer, taking ownership
   /// of the buffer in the process.
@@ -60,8 +58,7 @@ class OutputFileMap {
   /// the output file map.
   static llvm::Expected<OutputFileMap>
   loadFromBuffer(std::unique_ptr<llvm::MemoryBuffer> Buffer,
-                 StringRef workingDirectory,
-                 bool addEntriesForSourceRangeDependencies);
+                 StringRef workingDirectory);
 
   /// Get the map of outputs for the given \p Input, if present in the
   /// OutputFileMap. (If not present, returns nullptr.)
@@ -90,8 +87,7 @@ class OutputFileMap {
   /// Parses the given \p Buffer and returns either an OutputFileMap or
   /// error, taking ownership of \p Buffer in the process.
   static llvm::Expected<OutputFileMap>
-  parse(std::unique_ptr<llvm::MemoryBuffer> Buffer, StringRef workingDirectory,
-        bool addEntriesForSourceRangeDependencies);
+  parse(std::unique_ptr<llvm::MemoryBuffer> Buffer, StringRef workingDirectory);
 };
 
 } // end namespace swift

lib/Basic/OutputFileMap.cpp

@@ -21,32 +21,26 @@
 using namespace swift;
 
 llvm::Expected<OutputFileMap>
-OutputFileMap::loadFromPath(StringRef Path, StringRef workingDirectory,
-                            const bool addEntriesForSourceRangeDependencies) {
+OutputFileMap::loadFromPath(StringRef Path, StringRef workingDirectory) {
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =
       llvm::MemoryBuffer::getFile(Path);
   if (!FileBufOrErr) {
     return llvm::errorCodeToError(FileBufOrErr.getError());
   }
-  return loadFromBuffer(std::move(FileBufOrErr.get()), workingDirectory,
-                        addEntriesForSourceRangeDependencies);
+  return loadFromBuffer(std::move(FileBufOrErr.get()), workingDirectory);
 }
 
 llvm::Expected<OutputFileMap>
-OutputFileMap::loadFromBuffer(StringRef Data, StringRef workingDirectory,
-                              bool addEntriesForSourceRangeDependencies) {
+OutputFileMap::loadFromBuffer(StringRef Data, StringRef workingDirectory) {
   std::unique_ptr<llvm::MemoryBuffer> Buffer{
       llvm::MemoryBuffer::getMemBuffer(Data)};
-  return loadFromBuffer(std::move(Buffer), workingDirectory,
-                        addEntriesForSourceRangeDependencies);
+  return loadFromBuffer(std::move(Buffer), workingDirectory);
 }
 
 llvm::Expected<OutputFileMap>
 OutputFileMap::loadFromBuffer(std::unique_ptr<llvm::MemoryBuffer> Buffer,
-                              StringRef workingDirectory,
-                              bool addEntriesForSourceRangeDependencies) {
-  return parse(std::move(Buffer), workingDirectory,
-               addEntriesForSourceRangeDependencies);
+                              StringRef workingDirectory) {
+  return parse(std::move(Buffer), workingDirectory);
 }
 
 const TypeToPathMap *OutputFileMap::getOutputMapForInput(StringRef Input) const{
@@ -143,8 +137,7 @@ void OutputFileMap::write(llvm::raw_ostream &os,
 
 llvm::Expected<OutputFileMap>
 OutputFileMap::parse(std::unique_ptr<llvm::MemoryBuffer> Buffer,
-                     StringRef workingDirectory,
-                     const bool addEntriesForSourceRangeDependencies) {
+                     StringRef workingDirectory) {
   auto constructError =
       [](const char *errorString) -> llvm::Expected<OutputFileMap> {
     return llvm::make_error<llvm::StringError>(errorString,
@@ -233,25 +226,6 @@ OutputFileMap::parse(std::unique_ptr<llvm::MemoryBuffer> Buffer,
       llvm::SmallString<128> PathStorage;
       OutputMap.insert(std::pair<file_types::ID, std::string>(
           Kind, resolvePath(Path, PathStorage).str()));
-
-      // HACK: fake up an SwiftRanges & CompiledSource output filenames
-      if (addEntriesForSourceRangeDependencies &&
-          Kind == file_types::TY_SwiftDeps) {
-        // Not for the master-swiftdeps
-        llvm::SmallString<128> Storage;
-        if (!InputPath->getValue(Storage).empty()) {
-          std::string baseName = OutputMap[Kind];
-          baseName.resize(baseName.size() -
-                          getExtension(file_types::TY_SwiftDeps).size());
-          auto insertFilename = [&](file_types::ID type) {
-            std::string s = baseName;
-            s += getExtension(type);
-            OutputMap.insert({type, s});
-          };
-          insertFilename(file_types::TY_SwiftRanges);
-          insertFilename(file_types::TY_CompiledSource);
-        }
-      }
     }
 
     llvm::SmallString<128> InputStorage;

lib/Driver/Compilation.cpp

@@ -686,7 +686,7 @@ namespace driver {
       // might have been blocked.
       markFinished(FinishedCmd);
 
-      noteBuildingJobs(DependentsInEffect, useRangesForScheduling,
+      noteBuildingJobs(DependentsInEffect,
                        "because of dependencies discovered later");
 
       scheduleCommandsInSortedOrder(DependentsInEffect);
@@ -875,7 +875,7 @@ namespace driver {
     /// Figure out the best strategy and return those jobs. May return
     /// duplicates.
     CommandSet computeFirstRoundCompileJobsForIncrementalCompilation() {
-      return computeDependenciesAndGetNeededCompileJobs(/*useRanges=*/false);
+      return computeDependenciesAndGetNeededCompileJobs();
     }
 
     /// Return jobs to run if using dependencies, may include duplicates.

lib/Driver/Driver.cpp

@@ -2356,7 +2356,7 @@ Driver::buildOutputFileMap(const llvm::opt::DerivedArgList &Args,
 
   // TODO: perform some preflight checks to ensure the file exists.
   llvm::Expected<OutputFileMap> OFM = OutputFileMap::loadFromPath(
-      A->getValue(), workingDirectory, addEntriesForSourceFileDependencies);
+      A->getValue(), workingDirectory);
   if (auto Err = OFM.takeError()) {
     Diags.diagnose(SourceLoc(), diag::error_unable_to_load_output_file_map,
                    llvm::toString(std::move(Err)), A->getValue());