2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/BlazeInterners.java b/src/main/java/com/google/devtools/build/lib/concurrent/BlazeInterners.java
index b43b09bebd..7c9d6dc794 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/BlazeInterners.java
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/BlazeInterners.java
@@ -27,6 +27,10 @@ public class BlazeInterners {
     CONCURRENCY_LEVEL = (val == null) ? DEFAULT_CONCURRENCY_LEVEL : Integer.parseInt(val);
   }
 
+  public static int concurrencyLevel() {
+    return CONCURRENCY_LEVEL;
+  }
+
   private static InternerBuilder setConcurrencyLevel(InternerBuilder builder) {
     return builder.concurrencyLevel(CONCURRENCY_LEVEL);
   }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java b/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java
index d80b3b5416..ba442362d8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/InternerWithPresenceCheck.java
@@ -17,6 +17,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.Interner;
 import com.google.common.collect.MapMaker;
+import com.google.devtools.build.lib.concurrent.BlazeInterners;
 
 import java.util.concurrent.ConcurrentMap;
 
@@ -27,7 +28,8 @@ import javax.annotation.Nullable;
  * given sample object via {@link #getCanonical}.
  */
 public class InternerWithPresenceCheck<T> implements Interner<T> {
-  private final ConcurrentMap<T, T> map = new MapMaker().makeMap();
+  private final ConcurrentMap<T, T> map =
+      new MapMaker().concurrencyLevel(BlazeInterners.concurrencyLevel()).makeMap();
 
   @Override
   public T intern(T sample) {