Clean up the configuration-related code paths a bit.

- If we have a class object available, we can use .cast(Object)
- Only store the required options objects in CppConfigurationParameters
  rather than keeping the entire BuildOptions

--
MOS_MIGRATED_REVID=109981236

1 files changed, 4 insertions, 2 deletions

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;