Make --fdo_optimize paths be PathFragment instead of Path, and remove the now unused ConfigurationEnvironment#getBlazeDirectories()

PiperOrigin-RevId: 192443323

11 files changed, 39 insertions, 94 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationEnvironment.java
index 8b5e37a8ff..691cea22de 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationEnvironment.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.analysis.config;
 
-import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
@@ -25,7 +24,6 @@ import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider;
 import com.google.devtools.build.lib.pkgcache.PackageProvider;
 import com.google.devtools.build.lib.vfs.Path;
-import javax.annotation.Nullable;
 
 /**
  * An environment to support creating BuildConfiguration instances in a hermetic fashion; all
@@ -83,35 +81,15 @@ public interface ConfigurationEnvironment {
   /** Returns fragment based on fragment class and build options. */
   <T extends Fragment> T getFragment(BuildOptions buildOptions, Class<T> fragmentType)
       throws InvalidConfigurationException, InterruptedException;
-
-  /**
-   * Returns global value of BlazeDirectories.
-   *
-   * @deprecated Do not use this method. Configuration fragments should be fairly dumb key-value
-   * pairs so that they are cheap and easy to create.
-   */
-  @Nullable
-  @Deprecated
-  BlazeDirectories getBlazeDirectories() throws InterruptedException;
-
   /**
    * An implementation backed by a {@link PackageProvider} instance.
    */
   public static final class TargetProviderEnvironment implements ConfigurationEnvironment {
     private final LoadedPackageProvider packageProvider;
-    private final BlazeDirectories blazeDirectories;
-
-    public TargetProviderEnvironment(
-        PackageProvider packageProvider,
-        ExtendedEventHandler eventHandler,
-        BlazeDirectories blazeDirectories) {
-      this.packageProvider = new LoadedPackageProvider(packageProvider, eventHandler);
-      this.blazeDirectories = blazeDirectories;
-    }
 
     public TargetProviderEnvironment(
         PackageProvider packageProvider, ExtendedEventHandler eventHandler) {
-      this(packageProvider, eventHandler, null);
+      this.packageProvider = new LoadedPackageProvider(packageProvider, eventHandler);
     }
 
     @Override
@@ -134,10 +112,5 @@ public interface ConfigurationEnvironment {
     public <T extends Fragment> T getFragment(BuildOptions buildOptions, Class<T> fragmentType) {
       throw new UnsupportedOperationException();
     }
-
-    @Override
-    public BlazeDirectories getBlazeDirectories() {
-      return blazeDirectories;
-    }
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java b/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java
index 5a950839a7..ca3c5daad9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.analysis.config;
 
-import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
@@ -40,9 +39,6 @@ public interface PackageProviderForConfigurations {
   /** Returns fragment based on fragment type and build options. */
   <T extends Fragment> T getFragment(BuildOptions buildOptions, Class<T> fragmentType)
       throws InvalidConfigurationException, InterruptedException;
-
-  /** Returns blaze directories and adds dependency to that value. */
-  BlazeDirectories getDirectories() throws InterruptedException;
   
   /**
    * Returns true if any dependency is missing (value of some node hasn't been evaluated yet).
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
index fa3a3b7e56..5e5d726971 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
@@ -61,7 +61,6 @@ import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.util.FileTypeSet;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
-import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain;
 import com.google.devtools.build.skyframe.SkyFunction;
@@ -95,7 +94,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
    * Returns the profile name with the same file name as fdoProfile and an
    * extension that matches {@link FileType}.
    */
-  private static String getLLVMProfileFileName(Path fdoProfile, FileType type) {
+  private static String getLLVMProfileFileName(PathFragment fdoProfile, FileType type) {
     if (type.matches(fdoProfile)) {
       return fdoProfile.getBaseName();
     } else {
@@ -188,9 +187,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
    * the indexed format (.profdata) if necessary.
    */
   private Artifact convertLLVMRawProfileToIndexed(
-      Path fdoProfile,
-      CppToolchainInfo toolchainInfo,
-      RuleContext ruleContext)
+      PathFragment fdoProfile, CppToolchainInfo toolchainInfo, RuleContext ruleContext)
       throws InterruptedException {
 
     Artifact profileArtifact =
@@ -204,7 +201,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
       ruleContext.registerAction(
           new SymlinkAction(
               ruleContext.getActionOwner(),
-              PathFragment.create(fdoProfile.getPathString()),
+              fdoProfile,
               profileArtifact,
               "Symlinking LLVM Profile " + fdoProfile.getPathString()));
       return profileArtifact;
@@ -318,10 +315,10 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
         Preconditions.checkNotNull(ruleContext.getFragment(CppConfiguration.class));
     CppToolchainInfo toolchainInfo = getCppToolchainInfo(ruleContext, cppConfiguration);
 
-    Path fdoZip = null;
+    PathFragment fdoZip = null;
     if (ruleContext.getConfiguration().getCompilationMode() == CompilationMode.OPT) {
-      if (cppConfiguration.getFdoProfileAbsolutePath() != null) {
-        fdoZip = cppConfiguration.getFdoProfileAbsolutePath();
+      if (cppConfiguration.getFdoPath() != null) {
+        fdoZip = cppConfiguration.getFdoPath();
       } else if (cppConfiguration.getFdoProfileLabel() != null
           || cppConfiguration.getFdoOptimizeLabel() != null) {
         Artifact fdoArtifact;
@@ -353,7 +350,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
             return null;
           }
         }
-        fdoZip = fdoArtifact.getPath();
+        fdoZip = fdoArtifact.getPath().asFragment();
       }
     }
 
@@ -530,7 +527,8 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
     Artifact profileArtifact = null;
     if (fdoMode == FdoMode.LLVM_FDO) {
       profileArtifact =
-          convertLLVMRawProfileToIndexed(fdoZip, toolchainInfo, ruleContext);
+          convertLLVMRawProfileToIndexed(
+              fdoSupport.getFdoSupport().getFdoProfile().asFragment(), toolchainInfo, ruleContext);
       if (ruleContext.hasErrors()) {
         return null;
       }
@@ -607,7 +605,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
   }
 
   /** Returns true if LLVM FDO Optimization should be applied for this configuration. */
-  private boolean isLLVMOptimizedFdo(boolean isLLVMCompiler, Path fdoProfilePath) {
+  private boolean isLLVMOptimizedFdo(boolean isLLVMCompiler, PathFragment fdoProfilePath) {
     return fdoProfilePath != null
         && (CppFileTypes.LLVM_PROFILE.matches(fdoProfilePath)
             || CppFileTypes.LLVM_PROFILE_RAW.matches(fdoProfilePath)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index c21f8056fb..ffc58e6f01 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -161,7 +161,7 @@ public final class CppConfiguration extends BuildConfiguration.Fragment {
   private final boolean convertLipoToThinLto;
   private final PathFragment crosstoolTopPathFragment;
 
-  private final Path fdoProfileAbsolutePath;
+  private final PathFragment fdoPath;
   private final Label fdoOptimizeLabel;
 
   // TODO(bazel-team): All these labels (except for ccCompilerRuleLabel) can be removed once the
@@ -267,7 +267,7 @@ public final class CppConfiguration extends BuildConfiguration.Fragment {
         Preconditions.checkNotNull(params.commonOptions.cpu),
         cppOptions.convertLipoToThinLto,
         crosstoolTopPathFragment,
-        params.fdoProfileAbsolutePath,
+        params.fdoPath,
         params.fdoOptimizeLabel,
         params.ccToolchainLabel,
         params.stlLabel,
@@ -325,7 +325,7 @@ public final class CppConfiguration extends BuildConfiguration.Fragment {
       String desiredCpu,
       boolean convertLipoToThinLto,
       PathFragment crosstoolTopPathFragment,
-      Path fdoProfileAbsolutePath,
+      PathFragment fdoPath,
       Label fdoOptimizeLabel,
       Label ccToolchainLabel,
       Label stlLabel,
@@ -357,7 +357,7 @@ public final class CppConfiguration extends BuildConfiguration.Fragment {
     this.desiredCpu = desiredCpu;
     this.convertLipoToThinLto = convertLipoToThinLto;
     this.crosstoolTopPathFragment = crosstoolTopPathFragment;
-    this.fdoProfileAbsolutePath = fdoProfileAbsolutePath;
+    this.fdoPath = fdoPath;
     this.fdoOptimizeLabel = fdoOptimizeLabel;
     this.ccToolchainLabel = ccToolchainLabel;
     this.stlLabel = stlLabel;
@@ -1341,8 +1341,8 @@ public final class CppConfiguration extends BuildConfiguration.Fragment {
     return cppOptions.getFdoInstrument();
   }
 
-  public Path getFdoProfileAbsolutePath() {
-    return fdoProfileAbsolutePath;
+  public PathFragment getFdoPath() {
+    return fdoPath;
   }
 
   public Label getFdoOptimizeLabel() {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
index ead0f7e5a3..2d2d40e089 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.rules.cpp;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.RedirectChaser;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
@@ -33,7 +32,6 @@ import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
-import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig;
 import com.google.devtools.common.options.OptionsParsingException;
@@ -85,7 +83,7 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
     protected final Label crosstoolTop;
     protected final Label ccToolchainLabel;
     protected final Label stlLabel;
-    protected final Path fdoProfileAbsolutePath;
+    protected final PathFragment fdoPath;
     protected final Label fdoOptimizeLabel;
     protected final Label sysrootLabel;
     protected final CpuTransformer cpuTransformer;
@@ -95,7 +93,7 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
         CrosstoolConfigurationLoader.CrosstoolFile crosstoolFile,
         String cacheKeySuffix,
         BuildOptions buildOptions,
-        Path fdoProfileAbsolutePath,
+        PathFragment fdoPath,
         Label fdoOptimizeLabel,
         Label crosstoolTop,
         Label ccToolchainLabel,
@@ -107,7 +105,7 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
       this.cacheKeySuffix = cacheKeySuffix;
       this.commonOptions = buildOptions.get(BuildConfiguration.Options.class);
       this.cppOptions = buildOptions.get(CppOptions.class);
-      this.fdoProfileAbsolutePath = fdoProfileAbsolutePath;
+      this.fdoPath = fdoPath;
       this.fdoOptimizeLabel = fdoOptimizeLabel;
       this.crosstoolTop = crosstoolTop;
       this.ccToolchainLabel = ccToolchainLabel;
@@ -121,10 +119,7 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
   protected CppConfigurationParameters createParameters(
       ConfigurationEnvironment env, BuildOptions options)
       throws InvalidConfigurationException, InterruptedException {
-    BlazeDirectories directories = env.getBlazeDirectories();
-    if (directories == null) {
-      return null;
-    }
+
     Label crosstoolTopLabel = RedirectChaser.followRedirects(env,
         options.get(CppOptions.class).crosstoolTop, "crosstool_top");
     if (crosstoolTopLabel == null) {
@@ -149,7 +144,7 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
         CrosstoolConfigurationLoader.selectToolchain(
             file.getProto(), options, cpuTransformer.getTransformer());
 
-    Path fdoProfileAbsolutePath = null;
+    PathFragment fdoPath = null;
     Label fdoProfileLabel = null;
     if (cppOptions.getFdoOptimize() != null) {
       if (cppOptions.getFdoOptimize().startsWith("//")) {
@@ -160,11 +155,10 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
           throw new InvalidConfigurationException(e);
         }
       } else {
-        fdoProfileAbsolutePath =
-            directories.getWorkspace().getRelative(cppOptions.getFdoOptimize());
+        fdoPath = PathFragment.create(cppOptions.getFdoOptimize());
         try {
           // We don't check for file existence, but at least the filename should be well-formed.
-          FileSystemUtils.checkBaseName(fdoProfileAbsolutePath.getBaseName());
+          FileSystemUtils.checkBaseName(fdoPath.getBaseName());
         } catch (IllegalArgumentException e) {
           throw new InvalidConfigurationException(e);
         }
@@ -220,7 +214,7 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
         file,
         file.getMd5(),
         options,
-        fdoProfileAbsolutePath,
+        fdoPath,
         fdoProfileLabel,
         crosstoolTopLabel,
         ccToolchainLabel,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java
index 7f19208e98..ea6dddc02b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java
@@ -174,6 +174,7 @@ public class FdoSupport {
    * {@code null} if FDO optimization is disabled.  The profile file
    * can be a coverage ZIP or an AutoFDO feedback file.
    */
+  // TODO(lberki): this should be a PathFragment
   private final Path fdoProfile;
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java
index f864104b31..742835a9b1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java
@@ -57,13 +57,15 @@ public class FdoSupportFunction implements SkyFunction {
 
     Path execRoot = directories.getExecRoot(workspaceNameValue.getName());
     FdoSupportValue.Key key = (FdoSupportValue.Key) skyKey.argument();
+    Path fdoZip =
+        key.getFdoZip() == null ? null : directories.getWorkspace().getRelative(key.getFdoZip());
     FdoSupport fdoSupport;
     try {
       fdoSupport =
           FdoSupport.create(
               env,
               key.getFdoInstrument(),
-              key.getFdoZip(),
+              fdoZip,
               key.getLipoMode(),
               execRoot,
               directories.getProductName(),
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportValue.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportValue.java
index 8e092f9693..83c8173ec6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportValue.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportValue.java
@@ -18,7 +18,7 @@ import com.google.devtools.build.lib.concurrent.BlazeInterners;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.rules.cpp.FdoSupport.FdoMode;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.devtools.build.lib.vfs.Path;
+import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.LipoMode;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
@@ -46,11 +46,11 @@ public class FdoSupportValue implements SkyValue {
     private static final Interner<Key> interner = BlazeInterners.newWeakInterner();
 
     private final LipoMode lipoMode;
-    private final Path fdoZip;
+    private final PathFragment fdoZip;
     private final String fdoInstrument;
     private final FdoMode fdoMode;
 
-    private Key(LipoMode lipoMode, Path fdoZip, String fdoInstrument, FdoMode fdoMode) {
+    private Key(LipoMode lipoMode, PathFragment fdoZip, String fdoInstrument, FdoMode fdoMode) {
       this.lipoMode = lipoMode;
       this.fdoZip = fdoZip;
       this.fdoInstrument = fdoInstrument;
@@ -59,7 +59,7 @@ public class FdoSupportValue implements SkyValue {
 
     @AutoCodec.Instantiator
     @AutoCodec.VisibleForSerialization
-    static Key of(LipoMode lipoMode, Path fdoZip, String fdoInstrument, FdoMode fdoMode) {
+    static Key of(LipoMode lipoMode, PathFragment fdoZip, String fdoInstrument, FdoMode fdoMode) {
       return interner.intern(new Key(lipoMode, fdoZip, fdoInstrument, fdoMode));
     }
 
@@ -67,7 +67,7 @@ public class FdoSupportValue implements SkyValue {
       return lipoMode;
     }
 
-    public Path getFdoZip() {
+    public PathFragment getFdoZip() {
       return fdoZip;
     }
 
@@ -118,7 +118,7 @@ public class FdoSupportValue implements SkyValue {
   }
 
   public static SkyKey key(
-      LipoMode lipoMode, Path fdoZip, String fdoInstrument, FdoMode fdoMode) {
+      LipoMode lipoMode, PathFragment fdoZip, String fdoInstrument, FdoMode fdoMode) {
     return Key.of(lipoMode, fdoZip, fdoInstrument, fdoMode);
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
index 502184247f..a35a2e45de 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
@@ -44,15 +43,12 @@ import java.io.IOException;
 public final class ConfigurationFragmentFunction implements SkyFunction {
   private final Supplier<ImmutableList<ConfigurationFragmentFactory>> configurationFragments;
   private final RuleClassProvider ruleClassProvider;
-  private final BlazeDirectories directories;
 
   public ConfigurationFragmentFunction(
       Supplier<ImmutableList<ConfigurationFragmentFactory>> configurationFragments,
-      RuleClassProvider ruleClassProvider,
-      BlazeDirectories directories) {
+      RuleClassProvider ruleClassProvider) {
     this.configurationFragments = configurationFragments;
     this.ruleClassProvider = ruleClassProvider;
-    this.directories = directories;
   }
 
   @Override
@@ -64,7 +60,7 @@ public final class ConfigurationFragmentFunction implements SkyFunction {
     ConfigurationFragmentFactory factory = getFactory(configurationFragmentKey.getFragmentType());
     try {
       PackageProviderForConfigurations packageProvider =
-          new SkyframePackageLoaderWithValueEnvironment(env, ruleClassProvider, directories);
+          new SkyframePackageLoaderWithValueEnvironment(env, ruleClassProvider);
       ConfigurationEnvironment confEnv = new ConfigurationBuilderEnvironment(packageProvider);
       Fragment fragment = factory.create(confEnv, buildOptions);
 
@@ -134,11 +130,6 @@ public final class ConfigurationFragmentFunction implements SkyFunction {
         throws InvalidConfigurationException, InterruptedException {
       return packageProvider.getFragment(buildOptions, fragmentType);
     }
-
-    @Override
-    public BlazeDirectories getBlazeDirectories() throws InterruptedException {
-      return packageProvider.getDirectories();
-    }
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 3c9b125723..9a0f3f1305 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -463,7 +463,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
         new BuildConfigurationFunction(directories, ruleClassProvider, defaultBuildOptions));
     map.put(
         SkyFunctions.CONFIGURATION_FRAGMENT,
-        new ConfigurationFragmentFunction(configurationFragments, ruleClassProvider, directories));
+        new ConfigurationFragmentFunction(configurationFragments, ruleClassProvider));
     map.put(SkyFunctions.WORKSPACE_NAME, new WorkspaceNameFunction());
     map.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider));
     map.put(
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
index 95e5c7e4b7..9903969613 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
-import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
@@ -42,15 +41,11 @@ import java.io.IOException;
 class SkyframePackageLoaderWithValueEnvironment implements PackageProviderForConfigurations {
   private final SkyFunction.Environment env;
   private final RuleClassProvider ruleClassProvider;
-  private final BlazeDirectories directories;
 
   SkyframePackageLoaderWithValueEnvironment(
-      SkyFunction.Environment env,
-      RuleClassProvider ruleClassProvider,
-      BlazeDirectories directories) {
+      SkyFunction.Environment env, RuleClassProvider ruleClassProvider) {
     this.env = env;
     this.ruleClassProvider = ruleClassProvider;
-    this.directories = directories;
   }
 
   @Override
@@ -99,11 +94,6 @@ class SkyframePackageLoaderWithValueEnvironment implements PackageProviderForCon
   }
 
   @Override
-  public BlazeDirectories getDirectories() throws InterruptedException {
-    return directories;
-  }
-
-  @Override
   public boolean valuesMissing() {
     return env.valuesMissing();
   }