Review fixes

Author: David Ungar

include/swift/AST/Decl.h

@@ -958,10 +958,6 @@ class alignas(1 << DeclAlignInBits) Decl {
     assert(Mem); 
     return Mem; 
   }
-
-  /// Scaffolding to permit experimentation with finer-grained dependencies and
-  /// faster rebuilds.
-  bool getEnableExperimentalDependencies() const;
 };
 
 /// \brief Use RAII to track Decl validation progress and non-reentrancy.

include/swift/AST/DeclContext.h

@@ -524,10 +524,6 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
   LLVM_READONLY
   ASTContext &getASTContext() const;
 
-  /// Scaffolding to permit experimentation with finer-grained dependencies and
-  /// faster rebuilds.
-  bool getEnableExperimentalDependencies() const;
-
   /// Retrieve the set of protocols whose conformances will be
   /// associated with this declaration context.
   ///

include/swift/Driver/DependencyGraph.h

@@ -141,13 +141,11 @@ class DependencyGraphImpl {
   /// \sa SourceFile::getInterfaceHash
   llvm::DenseMap<const void *, std::string> InterfaceHashes;
 
-  LoadResult loadFromBuffer(const void *node, llvm::MemoryBuffer &buffer,
-                            const bool EnableExperimentalDependencies);
+  LoadResult loadFromBuffer(const void *node, llvm::MemoryBuffer &buffer);
 
 protected:
   LoadResult loadFromString(const void *node, StringRef data);
-  LoadResult loadFromPath(const void *node, StringRef path,
-                          const bool EnableExperimentalDependencies);
+  LoadResult loadFromPath(const void *node, StringRef path);
 
   void addIndependentNode(const void *node) {
     bool newlyInserted = Provides.insert({node, {}}).second;
@@ -230,10 +228,9 @@ class DependencyGraph : public DependencyGraphImpl {
   /// ("depends") are not cleared; new dependencies are considered additive.
   ///
   /// If \p node has already been marked, only its outgoing edges are updated.
-  LoadResult loadFromPath(T node, StringRef path,
-                          const bool EnableExperimentalDependencies) {
-    return DependencyGraphImpl::loadFromPath(
-        Traits::getAsVoidPointer(node), path, EnableExperimentalDependencies);
+  LoadResult loadFromPath(T node, StringRef path) {
+    return DependencyGraphImpl::loadFromPath(Traits::getAsVoidPointer(node),
+                                             path);
   }
 
   /// Load "depends" and "provides" data for \p node from a plain string.

include/swift/Option/Options.td

@@ -131,7 +131,7 @@ def driver_always_rebuild_dependents :
 
 def enable_experimental_dependencies :
 Flag<["-"], "enable-experimental-dependencies">, Flags<[FrontendOption, HelpHidden]>,
-HelpText<"When interface changes, be more selective">;
+HelpText<"Experimental work-in-progress to be more selective about incremental recompilation">;
 
 def driver_mode : Joined<["--"], "driver-mode=">, Flags<[HelpHidden]>,
   HelpText<"Set the driver mode to either 'swift' or 'swiftc'">;

lib/AST/Decl.cpp

@@ -6220,10 +6220,6 @@ void Decl::setClangNode(ClangNode Node) {
   *(ptr - 1) = Node.getOpaqueValue();
 }
 
-bool Decl::getEnableExperimentalDependencies() const {
-  return getASTContext().LangOpts.EnableExperimentalDependencies;
-}
-
 // See swift/Basic/Statistic.h for declaration: this enables tracing Decls, is
 // defined here to avoid too much layering violation / circular linkage
 // dependency.

lib/AST/DeclContext.cpp

@@ -624,10 +624,6 @@ unsigned DeclContext::printContext(raw_ostream &OS, unsigned indent) const {
   return Depth + 1;
 }
 
-bool DeclContext::getEnableExperimentalDependencies() const {
-  return getASTContext().LangOpts.EnableExperimentalDependencies;
-}
-
 const Decl *
 IterableDeclContext::getDecl() const {
   switch (getIterableContextKind()) {

lib/Driver/Compilation.cpp

@@ -408,9 +408,7 @@ namespace driver {
         if (ReturnCode == EXIT_SUCCESS || ReturnCode == EXIT_FAILURE) {
           bool wasCascading = DepGraph.isMarked(FinishedCmd);
 
-          switch (
-              DepGraph.loadFromPath(FinishedCmd, DependenciesFile,
-                                    Comp.getEnableExperimentalDependencies())) {
+          switch (DepGraph.loadFromPath(FinishedCmd, DependenciesFile)) {
           case DependencyGraphImpl::LoadResult::HadError:
             if (ReturnCode == EXIT_SUCCESS) {
               dependencyLoadFailed(DependenciesFile);
@@ -701,9 +699,7 @@ namespace driver {
           if (Cmd->getCondition() == Job::Condition::NewlyAdded) {
             DepGraph.addIndependentNode(Cmd);
           } else {
-            switch (DepGraph.loadFromPath(
-                Cmd, DependenciesFile,
-                Comp.getEnableExperimentalDependencies())) {
+            switch (DepGraph.loadFromPath(Cmd, DependenciesFile)) {
             case DependencyGraphImpl::LoadResult::HadError:
               dependencyLoadFailed(DependenciesFile, /*Warn=*/false);
               break;

lib/Driver/DependencyGraph.cpp

@@ -52,12 +52,11 @@ using DependencyKind = DependencyGraphImpl::DependencyKind;
 using DependencyCallbackTy = LoadResult(StringRef, DependencyKind, bool);
 using InterfaceHashCallbackTy = LoadResult(StringRef);
 
-static LoadResult parseDependencyFile(
-    llvm::MemoryBuffer &buffer,
-    llvm::function_ref<DependencyCallbackTy> providesCallback,
-    llvm::function_ref<DependencyCallbackTy> dependsCallback,
-    llvm::function_ref<InterfaceHashCallbackTy> interfaceHashCallback,
-    const bool EnableExperimentalDependencies) {
+static LoadResult
+parseDependencyFile(llvm::MemoryBuffer &buffer,
+                    llvm::function_ref<DependencyCallbackTy> providesCallback,
+                    llvm::function_ref<DependencyCallbackTy> dependsCallback,
+                    llvm::function_ref<InterfaceHashCallbackTy> interfaceHashCallback) {
   namespace yaml = llvm::yaml;
 
   // FIXME: Switch to a format other than YAML.
@@ -212,25 +211,21 @@ static LoadResult parseDependencyFile(
   return result;
 }
 
-LoadResult
-DependencyGraphImpl::loadFromPath(const void *node, StringRef path,
-                                  const bool EnableExperimentalDependencies) {
+LoadResult DependencyGraphImpl::loadFromPath(const void *node, StringRef path) {
   auto buffer = llvm::MemoryBuffer::getFile(path);
   if (!buffer)
     return LoadResult::HadError;
-  return loadFromBuffer(node, *buffer.get(), EnableExperimentalDependencies);
+  return loadFromBuffer(node, *buffer.get());
 }
 
 LoadResult
 DependencyGraphImpl::loadFromString(const void *node, StringRef data) {
   auto buffer = llvm::MemoryBuffer::getMemBuffer(data);
-  return loadFromBuffer(node, *buffer, false);
+  return loadFromBuffer(node, *buffer);
 }
 
-LoadResult
-DependencyGraphImpl::loadFromBuffer(const void *node,
-                                    llvm::MemoryBuffer &buffer,
-                                    const bool EnableExperimentalDependencies) {
+LoadResult DependencyGraphImpl::loadFromBuffer(const void *node,
+                                               llvm::MemoryBuffer &buffer) {
   auto &provides = Provides[node];
 
   auto dependsCallback = [this, node](StringRef name, DependencyKind kind,
@@ -296,8 +291,7 @@ DependencyGraphImpl::loadFromBuffer(const void *node,
   };
 
   return parseDependencyFile(buffer, providesCallback, dependsCallback,
-                             interfaceHashCallback,
-                             EnableExperimentalDependencies);
+                             interfaceHashCallback);
 }
 
 void DependencyGraphImpl::markExternal(SmallVectorImpl<const void *> &visited,