commit 8306d437ab758c8a45468c77635417a586eecad7
author tomlu <tomlu@google.com> Fri Aug 11 21:32:01 2017 +0200
committer Irina Iancu <elenairina@google.com> Mon Aug 14 14:15:38 2017 +0200
tree 84711af35d65c16ac05062fbbb1da9b617358bcb
parent 50f72495a5a1bfbb4ef57a42a81872b42829fb9f

Intern aspect definitions by their respective aspect class + parameters.

RELNOTES: None
PiperOrigin-RevId: 165010750

src/main/java/com/google/devtools/build/lib/packages/Aspect.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Aspect.java b/src/main/java/com/google/devtools/build/lib/packages/Aspect.java
index 817bc3c..3ef497697 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Aspect.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Aspect.java
@@ -15,6 +15,8 @@
 
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.util.Preconditions;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * An instance of a given {@code AspectClass} with loaded definition and parameters.
@@ -30,6 +32,17 @@
   /** */
   public static final String INJECTING_RULE_KIND_PARAMETER_KEY = "$injecting_rule_kind";
 
+  /**
+   * The aspect definition is a function of the aspect class + its parameters, so we can cache that.
+   *
+   * <p>The native aspects are loaded with blaze and are not stateful. Reference equality works fine
+   * in this case.
+   *
+   * <p>Caching of Skylark aspects is not yet implemented.
+   */
+  private static final Map<NativeAspectClass, Map<AspectParameters, AspectDefinition>>
+      definitionCache = new ConcurrentHashMap<>();
+
   private final AspectDescriptor aspectDescriptor;
   private final AspectDefinition aspectDefinition;
 
@@ -45,7 +58,11 @@
 
   public static Aspect forNative(
       NativeAspectClass nativeAspectClass, AspectParameters parameters) {
-    return new Aspect(nativeAspectClass, nativeAspectClass.getDefinition(parameters), parameters);
+    AspectDefinition definition =
+        definitionCache
+            .computeIfAbsent(nativeAspectClass, key -> new ConcurrentHashMap<>())
+            .computeIfAbsent(parameters, nativeAspectClass::getDefinition);
+    return new Aspect(nativeAspectClass, definition, parameters);
   }
 
   public static Aspect forNative(NativeAspectClass nativeAspectClass) {
@@ -54,9 +71,9 @@
 
   public static Aspect forSkylark(
       SkylarkAspectClass skylarkAspectClass,
-      AspectDefinition definition,
+      AspectDefinition aspectDefinition,
       AspectParameters parameters) {
-    return new Aspect(skylarkAspectClass, definition, parameters);
+    return new Aspect(skylarkAspectClass, aspectDefinition, parameters);
   }
 
   /**