Automatic code cleanup.

PiperOrigin-RevId: 444856681

Author: Googler

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

@@ -356,8 +356,13 @@ public static List<Pair<Artifact, Label>> getHeaders(RuleContext ruleContext) {
       FileProvider provider = target.getProvider(FileProvider.class);
       for (Artifact artifact : provider.getFilesToBuild().toList()) {
         if (CppRuleClasses.DISALLOWED_HDRS_FILES.matches(artifact.getFilename())) {
-          ruleContext.attributeWarning("hdrs", "file '" + artifact.getFilename()
-              + "' from target '" + target.getLabel() + "' is not allowed in hdrs");
+          ruleContext.attributeWarning(
+              "hdrs",
+              "file '"
+                  + artifact.getFilename()
+                  + "' from target '"
+                  + target.getLabel()
+                  + "' is not allowed in hdrs");
           continue;
         }
         Label oldLabel = map.put(artifact, target.getLabel());
@@ -366,9 +371,7 @@ public static List<Pair<Artifact, Label>> getHeaders(RuleContext ruleContext) {
               "hdrs",
               String.format(
                   "Artifact '%s' is duplicated (through '%s' and '%s')",
-                  artifact.getExecPathString(),
-                  oldLabel,
-                  target.getLabel()));
+                  artifact.getExecPathString(), oldLabel, target.getLabel()));
         }
       }
     }
@@ -380,6 +383,14 @@ public static List<Pair<Artifact, Label>> getHeaders(RuleContext ruleContext) {
     return result.build();
   }
 
+  /**
+   * Returns the files from headers and does some checks. Note that this method reports warnings to
+   * the {@link RuleContext} as a side effect, and so should only be called once for any given rule.
+   */
+  public List<Pair<Artifact, Label>> getHeaders() {
+    return getHeaders(ruleContext);
+  }
+
   /** Returns the C++ toolchain provider. */
   @StarlarkMethod(name = "toolchain", documented = false, structField = true)
   public CcToolchainProvider getToolchain() {
@@ -391,14 +402,6 @@ public FdoContext getFdoContext() {
     return fdoContext;
   }
 
-  /**
-   * Returns the files from headers and does some checks. Note that this method reports warnings to
-   * the {@link RuleContext} as a side effect, and so should only be called once for any given rule.
-   */
-  public List<Pair<Artifact, Label>> getHeaders() {
-    return getHeaders(ruleContext);
-  }
-
   @StarlarkMethod(
       name = "report_invalid_options",
       documented = false,

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

@@ -389,21 +389,6 @@ public CcCompilationHelper addPublicHeaders(Collection<Artifact> headers) {
     return this;
   }
 
-  /**
-   * Adds headers that are compiled into a separate module (when using C++ modules). The idea here
-   * is that a single (generated) library might want to create headers of very different transitive
-   * dependency size. In this case, building headers with very few transitive dependencies into a
-   * separate module can drastrically improve build performance of that module and its users.
-   *
-   * <p>Headers in this separate module must not include any of the regular headers.
-   *
-   * <p>THIS IS AN EXPERIMENTAL FACILITY THAT MIGHT GO AWAY.
-   */
-  public CcCompilationHelper addSeparateModuleHeaders(Collection<Artifact> headers) {
-    separateModuleHeaders.addAll(headers);
-    return this;
-  }
-
   /**
    * Adds {@code headers} as public header files. These files will be made visible to dependent
    * rules. They may be parsed/preprocessed or compiled into a header module depending on the
@@ -426,6 +411,21 @@ public CcCompilationHelper addPublicHeaders(Iterable<Pair<Artifact, Label>> head
     return this;
   }
 
+  /**
+   * Adds headers that are compiled into a separate module (when using C++ modules). The idea here
+   * is that a single (generated) library might want to create headers of very different transitive
+   * dependency size. In this case, building headers with very few transitive dependencies into a
+   * separate module can drastrically improve build performance of that module and its users.
+   *
+   * <p>Headers in this separate module must not include any of the regular headers.
+   *
+   * <p>THIS IS AN EXPERIMENTAL FACILITY THAT MIGHT GO AWAY.
+   */
+  public CcCompilationHelper addSeparateModuleHeaders(Collection<Artifact> headers) {
+    separateModuleHeaders.addAll(headers);
+    return this;
+  }
+
   /**
    * Add the corresponding files as public header files, i.e., these files will not be compiled, but
    * are made visible as includes to dependent rules in module maps.

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

@@ -504,7 +504,6 @@ protected <T> Object asClassImmutableListOrNestedSet(
    * @param objectFiles {@code Sequence<Artifact>}
    * @return
    * @throws EvalException
-   * @throws InterruptedException
    */
   @Override
   public LibraryToLink createLibraryLinkerInput(

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

@@ -1290,22 +1290,6 @@ protected FeatureConfiguration() {
           /* ccToolchainPath= */ PathFragment.EMPTY_FRAGMENT);
     }
 
-    @AutoCodec.Instantiator
-    static FeatureConfiguration createForSerialization(
-        ImmutableSet<String> requestedFeatures,
-        ImmutableList<Feature> enabledFeatures,
-        ImmutableSet<String> enabledActionConfigActionNames,
-        ImmutableMap<String, ActionConfig> actionConfigByActionName,
-        PathFragment ccToolchainPath) {
-      return FEATURE_CONFIGURATION_INTERNER.intern(
-          new FeatureConfiguration(
-              requestedFeatures,
-              enabledFeatures,
-              enabledActionConfigActionNames,
-              actionConfigByActionName,
-              ccToolchainPath));
-    }
-
     FeatureConfiguration(
         ImmutableSet<String> requestedFeatures,
         ImmutableList<Feature> enabledFeatures,
@@ -1325,6 +1309,22 @@ static FeatureConfiguration createForSerialization(
       this.ccToolchainPath = ccToolchainPath;
     }
 
+    @AutoCodec.Instantiator
+    static FeatureConfiguration createForSerialization(
+        ImmutableSet<String> requestedFeatures,
+        ImmutableList<Feature> enabledFeatures,
+        ImmutableSet<String> enabledActionConfigActionNames,
+        ImmutableMap<String, ActionConfig> actionConfigByActionName,
+        PathFragment ccToolchainPath) {
+      return FEATURE_CONFIGURATION_INTERNER.intern(
+          new FeatureConfiguration(
+              requestedFeatures,
+              enabledFeatures,
+              enabledActionConfigActionNames,
+              actionConfigByActionName,
+              ccToolchainPath));
+    }
+
     /**
      * @return whether the given {@code feature} is enabled.
      */

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

@@ -267,7 +267,8 @@ static PathFragment resolveIncludeDir(
         // TODO(jungjw): This should probably be getExecPath.
         pathPrefix = PackageIdentifier.parse(packageString).getPackagePath(siblingRepositoryLayout);
       } catch (LabelSyntaxException e) {
-        throw new InvalidConfigurationException("The package '" + packageString + "' is not valid");
+        throw new InvalidConfigurationException(
+            "The package '" + packageString + "' is not valid", e);
       }
       int pathStartIndex = packageEndIndex + PACKAGE_END.length();
       if (pathStartIndex + 1 < s.length()) {
@@ -347,9 +348,6 @@ private static CppModuleMap createCrosstoolModuleMap(CcToolchainAttributesProvid
   /**
    * Returns {@link CcToolchainVariables} instance with build variables that only depend on the
    * toolchain.
-   *
-   * @throws RuleErrorException if there are configuration errors making it impossible to resolve
-   *     certain build variables of this toolchain
    */
   static CcToolchainVariables getBuildVariables(
       BuildOptions buildOptions,

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

@@ -446,7 +446,7 @@ boolean isAvailable(String variable, @Nullable ArtifactExpander expander) {
       return lookupVariable(variable, /* throwOnMissingVariable= */ false, expander) != null;
     } catch (ExpansionException e) {
       throw new IllegalStateException(
-          "Should not happen - call to lookupVariable threw when asked not to.");
+          "Should not happen - call to lookupVariable threw when asked not to.", e);
     }
   }
 

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

@@ -181,7 +181,7 @@ public ImmutableList<String> getCopts() {
             variables, CompileBuildVariables.USER_COMPILE_FLAGS.getVariableName());
       } catch (ExpansionException e) {
         throw new IllegalStateException(
-            "Should not happen - 'user_compile_flags' should be a string list, but wasn't.");
+            "Should not happen - 'user_compile_flags' should be a string list, but wasn't.", e);
       }
     } else {
       return ImmutableList.of();

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

@@ -711,35 +711,6 @@ List<PathFragment> getSystemIncludeDirs() throws CommandLineExpansionException {
     return getSystemIncludeDirs(getCompilerOptions());
   }
 
-  private static final ImmutableList<CharMatcher> MSVC_CHARS =
-      ImmutableList.of(
-          CharMatcher.anyOf("mM"),
-          CharMatcher.anyOf("sS"),
-          CharMatcher.anyOf("vV"),
-          CharMatcher.anyOf("cC"));
-  private static final ImmutableList<CharMatcher> INCLUDE_PREFIX_CHARS =
-      ImmutableList.of(CharMatcher.anyOf("-/"), CharMatcher.anyOf("iI"));
-
-  private static boolean substrMatchesChars(
-      String s, int startPos, ImmutableList<CharMatcher> substr) {
-    for (int i = 0; i < substr.size(); i++) {
-      if (!substr.get(i).matches(s.charAt(startPos + i))) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private static boolean matchesCaseInsensitiveMsvc(String s) {
-    return s.length() >= 4 && substrMatchesChars(s, 0, MSVC_CHARS);
-  }
-
-  private static boolean matchesIncludeCaseInsensitiveMsvc(String s) {
-    return s.length() >= 6
-        && substrMatchesChars(s, 0, INCLUDE_PREFIX_CHARS)
-        && substrMatchesChars(s, 2, MSVC_CHARS);
-  }
-
   private List<PathFragment> getSystemIncludeDirs(List<String> compilerOptions) {
     // TODO(bazel-team): parsing the command line flags here couples us to gcc- and clang-cl-style
     // compiler command lines; use a different way to specify system includes (for example through a
@@ -773,6 +744,35 @@ private List<PathFragment> getSystemIncludeDirs(List<String> compilerOptions) {
     return result.build();
   }
 
+  private static final ImmutableList<CharMatcher> MSVC_CHARS =
+      ImmutableList.of(
+          CharMatcher.anyOf("mM"),
+          CharMatcher.anyOf("sS"),
+          CharMatcher.anyOf("vV"),
+          CharMatcher.anyOf("cC"));
+  private static final ImmutableList<CharMatcher> INCLUDE_PREFIX_CHARS =
+      ImmutableList.of(CharMatcher.anyOf("-/"), CharMatcher.anyOf("iI"));
+
+  private static boolean substrMatchesChars(
+      String s, int startPos, ImmutableList<CharMatcher> substr) {
+    for (int i = 0; i < substr.size(); i++) {
+      if (!substr.get(i).matches(s.charAt(startPos + i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  private static boolean matchesCaseInsensitiveMsvc(String s) {
+    return s.length() >= 4 && substrMatchesChars(s, 0, MSVC_CHARS);
+  }
+
+  private static boolean matchesIncludeCaseInsensitiveMsvc(String s) {
+    return s.length() >= 6
+        && substrMatchesChars(s, 0, INCLUDE_PREFIX_CHARS)
+        && substrMatchesChars(s, 2, MSVC_CHARS);
+  }
+
   private static ImmutableList<String> getCmdlineIncludes(List<String> args) {
     ImmutableList.Builder<String> cmdlineIncludes = ImmutableList.builder();
     for (Iterator<String> argi = args.iterator(); argi.hasNext(); ) {

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

@@ -760,7 +760,7 @@ public CppLinkAction build() throws InterruptedException, RuleErrorException {
             .build();
 
     PathFragment paramRootPath =
-        ParameterFile.derivePath(outputRootPath, (isLtoIndexing) ? "lto-index" : "2");
+        ParameterFile.derivePath(outputRootPath,  isLtoIndexing ? "lto-index" : "2");
 
     @Nullable
     final Artifact paramFile =