Replace stream usage to reduce garbage creation on hot codepaths.

RELNOTES: None. PiperOrigin-RevId: 240765715
luca-digrazia · Sep 4, 2022 · 9b12936 · 9b12936
1 parent 290069f
commit 9b12936
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...a/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/...a/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -422,7 +422,7 @@ public final void initializeJavacOpts() {
   /** Computes javacopts for the current rule. */
   private ImmutableList<String> computeJavacOpts(Collection<String> extraRuleJavacOpts) {
     return ImmutableList.<String>builder()
-        .addAll(javaToolchain.getJavacOptions(ruleContext))
+        .addAll(javaToolchain.getJavacOptions())
         .addAll(extraRuleJavacOpts)
         .addAll(computePerPackageJavacOpts(ruleContext, javaToolchain))
         .addAll(ruleContext.getExpander().withDataLocations().tokenized("javacopts"))

diff --git a/.../main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationProvider.java b/.../main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationProvider.java
@@ -55,7 +55,7 @@ public static JavaPackageConfigurationProvider create(
   public boolean matches(Label label) {
     // Do not use streams here as they create excessive garbage.
     for (PackageSpecificationProvider provider : packageSpecifications()) {
-      for (PackageGroupContents specifications : provider.getPackageSpecifications().toList()) {
+      for (PackageGroupContents specifications : provider.getPackageSpecifications()) {
         if (specifications.containsPackage(label.getPackageIdentifier())) {
           return true;
         }