Remove references to middlemen from the code of C++ rules.

The kind of middlemen C++ rules used (scheduling dependency middlemen) stopped existing a long time ago and the demise of middlemen in general is a good time to remove these obsolete references, too. RELNOTES: None. PiperOrigin-RevId: 696431863 Change-Id: If47e4f4ebaa5e044b132b431f608b3dfe70ffafa
fmeum · Nov 14, 2024 · c0a210d · c0a210d
1 parent dfdbe77
commit c0a210d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
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
@@ -696,7 +696,6 @@ public static Builder builder() {
 
   /** Builder class for {@link CcCompilationContext}. */
   public static class Builder {
-    private String purpose;
     private final NestedSetBuilder<Artifact> compilationPrerequisites =
         NestedSetBuilder.stableOrder();
     private final TransitiveSetHelper<PathFragment> includeDirs = new TransitiveSetHelper<>();
@@ -722,21 +721,6 @@ public static class Builder {
     /** Creates a new builder for a {@link CcCompilationContext} instance. */
     private Builder() {}
 
-    /**
-     * Overrides the purpose of this context.
-     *
-     * @param a string suitable for use as a filename.
-     */
-    @CanIgnoreReturnValue
-    public Builder setPurpose(String purpose) {
-      this.purpose = purpose;
-      return this;
-    }
-
-    public String getPurpose() {
-      return purpose;
-    }
-
     /**
      * Merges the {@link CcCompilationContext} of a dependency into this one by adding the contents
      * of all of its attributes.

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -294,7 +294,7 @@ public CcCompilationContext getCcCompilationContext() {
   private final CcToolchainProvider ccToolchain;
   private final FdoContext fdoContext;
   private boolean generateModuleMap = true;
-  private String purpose = "cc_compilation_middleman";
+  private String purpose = "";
   private boolean generateNoPicAction;
   private boolean generatePicAction;
   private boolean isCodeCoverageEnabled = true;
@@ -862,8 +862,6 @@ public CompilationInfo compile(RuleContext ruleContext)
         (CcCompilationContext) ccCompilationContextObjectsTuple.get(0);
     ccCompilationContext = publicCompilationContext;
     if (!implementationDeps.isEmpty()) {
-      // We set a different purpose so that the middleman doesn't clash with the one from propagated
-      // ccCompilationContext.
       Preconditions.checkState(
           ccCompilationContextObjectsTuple.get(1) != Starlark.NONE,
           "Compilation context for implementation deps was not created");
@@ -906,9 +904,8 @@ public CcCompilationHelper doNotGenerateModuleMap() {
   /**
    * Sets the purpose for the {@code CcCompilationContext}.
    *
-   * @see CcCompilationContext.Builder#setPurpose
-   * @param purpose must be a string which is suitable for use as a filename. A single rule may have
-   *     many middlemen with distinct purposes.
+   * @param purpose the purpose. Only used to influence the location of the output of Objective-C
+   *     compilation.
    */
   @CanIgnoreReturnValue
   public CcCompilationHelper setPurpose(String purpose) {

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -710,7 +710,7 @@ public CcCompilationContext createCcCompilationContext(
       Sequence<?> directTextualHdrs,
       Sequence<?> directPublicHdrs,
       Sequence<?> directPrivateHdrs,
-      Object purposeNoneable,
+      Object unused3,
       Object moduleMap,
       Object unused1,
       Object unused2,
@@ -769,13 +769,6 @@ public CcCompilationContext createCcCompilationContext(
     ccCompilationContext.addModularPublicHdrs(modularPublicHdrsList);
     ccCompilationContext.addModularPrivateHdrs(modularPrivateHdrsList);
 
-    // Private parameters.
-    if (purposeNoneable != null
-        && purposeNoneable != Starlark.UNBOUND
-        && purposeNoneable != Starlark.NONE) {
-      ccCompilationContext.setPurpose((String) purposeNoneable);
-    }
-
     if (moduleMap != null && moduleMap != Starlark.UNBOUND && moduleMap != Starlark.NONE) {
       ccCompilationContext.setCppModuleMap((CppModuleMap) moduleMap);
     }

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CcModuleApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CcModuleApi.java
@@ -1748,7 +1748,7 @@ CompilationContextT createCcCompilationContext(
       Sequence<?> directTextualHdrs,
       Sequence<?> directPublicHdrs,
       Sequence<?> directPrivateHdrs,
-      Object purpose,
+      Object unused3,
       Object moduleMap,
       Object unused1,
       Object unused2,