commit 688930dcf7e05ca3e09fbfff14c3450919d89f8c
author Googler <noreply@google.com> Fri Aug 24 10:27:07 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Aug 24 10:30:59 2018 -0700
tree 14ae0129488cc96f3b368ceb64eaf0b3117f22ed
parent de556c3132e6fa0e522729abffc2dd49aa94cc2f

Avoid Set.removeAll(List), which is quadratic if set.size() <= list.size().

RELNOTES: None.
PiperOrigin-RevId: 210117999

src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
index 0e05539..e3f4d2d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
@@ -209,8 +209,12 @@
         }
       }
     }
-    modularHeaders.removeAll(headerInfo.modularHeaders);
-    modularHeaders.removeAll(headerInfo.textualHeaders);
+    for (Artifact a : headerInfo.modularHeaders) {
+      modularHeaders.remove(a);
+    }
+    for (Artifact a : headerInfo.textualHeaders) {
+      modularHeaders.remove(a);
+    }
     return new IncludeScanningHeaderData(
         Collections.unmodifiableMap(pathToLegalOutputArtifact),
         Collections.unmodifiableSet(modularHeaders));

src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
index bd7bcde..6387161 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -404,27 +404,25 @@
         cppConfiguration.isStrictSystemIncludes()
             ? getBuiltInIncludeDirectories()
             : getValidationIgnoredDirs();
-    ArrayList<Artifact> found = new ArrayList<>();
+    Set<Artifact> missing = Sets.newHashSet();
     // Lazily initialize, so that compiles that properly declare all their files profit.
     Set<PathFragment> declaredIncludeDirs = null;
     for (Artifact header : undeclaredHeaders) {
       if (FileSystemUtils.startsWithAny(header.getExecPath(), ignoreDirs)) {
-        found.add(header);
         continue;
       }
       if (declaredIncludeDirs == null) {
         declaredIncludeDirs = ccCompilationContext.getDeclaredIncludeDirs().toSet();
       }
-      if (isDeclaredIn(actionExecutionContext, header, declaredIncludeDirs)) {
-        found.add(header);
+      if (!isDeclaredIn(actionExecutionContext, header, declaredIncludeDirs)) {
+        missing.add(header);
       }
     }
-    undeclaredHeaders.removeAll(found);
-    if (undeclaredHeaders.isEmpty()) {
+    if (missing.isEmpty()) {
       return headers;
     }
 
-    return Iterables.filter(headers, header -> !undeclaredHeaders.contains(header));
+    return Iterables.filter(headers, header -> !missing.contains(header));
   }
 
   @Nullable