diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java index f37e5e2963..d201d880cd 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java @@ -99,7 +99,7 @@ public final class AspectFunction implements SkyFunction { if (skylarkImportLookupValue == null) { return null; } - + Object skylarkValue = skylarkImportLookupValue.getEnvironmentExtension() .get(skylarkValueName); if (!(skylarkValue instanceof SkylarkAspect)) { @@ -123,10 +123,9 @@ public final class AspectFunction implements SkyFunction { AspectKey key = (AspectKey) skyKey.argument(); ConfiguredAspectFactory aspectFactory; Aspect aspect; - if (key.getAspectClass() instanceof NativeAspectClass<?>) { - NativeAspectClass<?> nativeAspectClass = (NativeAspectClass<?>) key.getAspectClass(); - aspectFactory = - (ConfiguredAspectFactory) nativeAspectClass.newInstance(); + if (key.getAspectClass() instanceof NativeAspectClass) { + NativeAspectClass nativeAspectClass = (NativeAspectClass) key.getAspectClass(); + aspectFactory = (ConfiguredAspectFactory) nativeAspectClass; aspect = Aspect.forNative(nativeAspectClass, key.getParameters()); } else if (key.getAspectClass() instanceof SkylarkAspectClass) { SkylarkAspectClass skylarkAspectClass = (SkylarkAspectClass) key.getAspectClass(); |