commit 4e0a5cb6209952ff9d83b9aa41d68c133ea4a964
author Googler <noreply@google.com> Sun Apr 09 17:58:18 2017 -0400
committer Kristina Chodorow <kchodorow@google.com> Tue May 09 10:54:03 2017 -0400
tree a230735a364d1d7e68755b30cd2dc76330ef35ce
parent 6daff173a68287452598f735f5bae2134fae0815

Optimize TransitiveInfoMap memory consumption.

Instead of using ImmutableMap, we share the keys between all provider maps with an identical key set.

PiperOrigin-RevId: 155432135

src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
index 10f5cae..a9079ad 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
@@ -17,7 +17,6 @@
 import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * A single dependency with its configured target and aspects merged together.
@@ -90,9 +89,9 @@
     }
 
     for (ConfiguredAspect aspect : aspects) {
-      for (Map.Entry<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider> entry :
-          aspect.getProviders().entries()) {
-        Class<? extends TransitiveInfoProvider> providerClass = entry.getKey();
+      TransitiveInfoProviderMap providers = aspect.getProviders();
+      for (int i = 0; i < providers.getProviderCount(); ++i) {
+        Class<? extends TransitiveInfoProvider> providerClass = providers.getProviderClassAt(i);
         if (OutputGroupProvider.class.equals(providerClass)
             || SkylarkProviders.class.equals(providerClass)
             || ExtraActionArtifactsProvider.class.equals(providerClass)) {
@@ -103,7 +102,7 @@
           throw new IllegalStateException("Provider " + providerClass + " provided twice");
         }
 
-        aspectProviders.add(entry.getValue());
+        aspectProviders.add(providers.getProviderAt(i));
       }
     }
     return new MergedConfiguredTarget(base, aspectProviders.build());