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, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index c209e61a1a..ff3d0dae83 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -141,12 +141,10 @@ public final class BuildOptions implements Cloneable, Serializable {
   /**
    * Returns the actual instance of a FragmentOptions class.
    */
-  @SuppressWarnings("unchecked")
   public <T extends FragmentOptions> T get(Class<T> optionsClass) {
     FragmentOptions options = fragmentOptionsMap.get(optionsClass);
     Preconditions.checkNotNull(options);
-    Preconditions.checkArgument(optionsClass.isAssignableFrom(options.getClass()));
-    return (T) options;
+    return optionsClass.cast(options);
   }
 
   /**