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, 1 insertions, 2 deletions

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 95ff677240..95bd400795 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
@@ -72,7 +72,6 @@ class SkyframePackageLoaderWithValueEnvironment implements PackageProviderForCon
     }
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public <T extends Fragment> T getFragment(BuildOptions buildOptions, Class<T> fragmentType)
       throws InvalidConfigurationException {
@@ -82,7 +81,7 @@ class SkyframePackageLoaderWithValueEnvironment implements PackageProviderForCon
     if (fragmentNode == null) {
       return null;
     }
-    return (T) fragmentNode.getFragment();
+    return fragmentType.cast(fragmentNode.getFragment());
   }
 
   @Override