2 files changed, 7 insertions, 6 deletions
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 63ff4ff41e..7ae7beb171 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
@@ -359,7 +359,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
   protected CppConfiguration(CppConfigurationParameters params)
       throws InvalidConfigurationException {
     CrosstoolConfig.CToolchain toolchain = params.toolchain;
-    cppOptions = params.buildOptions.get(CppOptions.class);
+    cppOptions = params.cppOptions;
     this.hostSystemName = toolchain.getHostSystemName();
     this.compiler = toolchain.getCompiler();
     this.targetCpu = toolchain.getTargetCpu();
@@ -368,8 +368,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
     this.targetLibc = toolchain.getTargetLibc();
     this.crosstoolTop = params.crosstoolTop;
     this.ccToolchainLabel = params.ccToolchainLabel;
-    this.compilationMode =
-        params.buildOptions.get(BuildConfiguration.Options.class).compilationMode;
+    this.compilationMode = params.commonOptions.compilationMode;
     this.lipoContextCollector = cppOptions.lipoCollector;
     this.execRoot = params.execRoot;
 
@@ -411,7 +410,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
     }
 
     this.fdoSupport = new FdoSupport(
-        params.buildOptions.get(CppOptions.class).fdoInstrument, params.fdoZip,
+        cppOptions.fdoInstrument, params.fdoZip,
         cppOptions.lipoMode, execRoot);
 
     this.stripBinaries =
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 a68b800bd4..2b200f9ef4 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
@@ -88,7 +88,8 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
   public static class CppConfigurationParameters {
     protected final CrosstoolConfig.CToolchain toolchain;
     protected final String cacheKeySuffix;
-    protected final BuildOptions buildOptions;
+    protected final BuildConfiguration.Options commonOptions;
+    protected final CppOptions cppOptions;
     protected final Label crosstoolTop;
     protected final Label ccToolchainLabel;
     protected final Path fdoZip;
@@ -103,7 +104,8 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory {
         Label ccToolchainLabel) {
       this.toolchain = toolchain;
       this.cacheKeySuffix = cacheKeySuffix;
-      this.buildOptions = buildOptions;
+      this.commonOptions = buildOptions.get(BuildConfiguration.Options.class);
+      this.cppOptions = buildOptions.get(CppOptions.class);
       this.fdoZip = fdoZip;
       this.execRoot = execRoot;
       this.crosstoolTop = crosstoolTop;