Add automatic exec groups to cc_common.compile

PiperOrigin-RevId: 516486514 Change-Id: I05844398289f1a57ce38bba68383065c1c192d9a
fweikert · Mar 14, 2023 · 6d004a3 · 6d004a3
1 parent bc83389
commit 6d004a3
Show file tree

Hide file tree

Showing 4 changed files with 344 additions and 16 deletions.
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
@@ -1358,7 +1358,6 @@ private CcCompilationOutputs createCcCompileActions() throws RuleErrorException
       CppCompileActionBuilder builder = initializeCompileAction(sourceArtifact);
 
       builder
-          .setSemantics(semantics)
           .addMandatoryInputs(additionalCompilationInputs)
           .addAdditionalIncludeScanningRoots(additionalIncludeScanningRoots);
 
@@ -1447,7 +1446,6 @@ private CcCompilationOutputs createCcCompileActions() throws RuleErrorException
       }
       CppCompileActionBuilder builder = initializeCompileAction(artifact);
       builder
-          .setSemantics(semantics)
           .addMandatoryInputs(additionalCompilationInputs)
           .addAdditionalIncludeScanningRoots(additionalIncludeScanningRoots);
 
@@ -1670,7 +1668,7 @@ private static String toPathString(Artifact a) {
    */
   private CppCompileActionBuilder initializeCompileAction(Artifact sourceArtifact) {
     return new CppCompileActionBuilder(
-            actionConstructionContext, grepIncludes, ccToolchain, configuration)
+            actionConstructionContext, grepIncludes, ccToolchain, configuration, semantics)
         .setSourceFile(sourceArtifact)
         .setCcCompilationContext(ccCompilationContext)
         .setCoptsFilter(coptsFilter)
@@ -1687,7 +1685,6 @@ private void createModuleCodegenAction(
     boolean pic = module.getFilename().contains(".pic.");
 
     CppCompileActionBuilder builder = initializeCompileAction(module);
-    builder.setSemantics(semantics);
     builder.setPicMode(pic);
     builder.setOutputs(
         actionConstructionContext,
@@ -1788,7 +1785,6 @@ private ImmutableList<Artifact> createModuleAction(
     Artifact moduleMapArtifact = cppModuleMap.getArtifact();
     CppCompileActionBuilder builder = initializeCompileAction(moduleMapArtifact);
 
-    builder.setSemantics(semantics);
     Label label = Label.parseCanonicalUnchecked(cppModuleMap.getName());
 
     // A header module compile action is just like a normal compile action, but:

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
@@ -90,8 +90,16 @@ public CppCompileActionBuilder(
       ActionConstructionContext actionConstructionContext,
       @Nullable Artifact grepIncludes,
       CcToolchainProvider ccToolchain,
-      BuildConfigurationValue configuration) {
-    this.owner = actionConstructionContext.getActionOwner();
+      BuildConfigurationValue configuration,
+      CppSemantics cppSemantics) {
+
+    ActionOwner actionOwner = null;
+    if (actionConstructionContext instanceof RuleContext
+        && ((RuleContext) actionConstructionContext).useAutoExecGroups()) {
+      actionOwner = actionConstructionContext.getActionOwner(cppSemantics.getCppToolchainType());
+    }
+
+    this.owner = actionOwner == null ? actionConstructionContext.getActionOwner() : actionOwner;
     this.shareable = false;
     this.configuration = configuration;
     this.cppConfiguration = configuration.getFragment(CppConfiguration.class);
@@ -102,6 +110,7 @@ public CppCompileActionBuilder(
     this.ccToolchain = ccToolchain;
     this.builtinIncludeDirectories = ccToolchain.getBuiltInIncludeDirectories();
     this.grepIncludes = grepIncludes;
+    this.cppSemantics = cppSemantics;
   }
 
   /**
@@ -572,13 +581,6 @@ public CppCompileActionBuilder setPicMode(boolean usePic) {
     return this;
   }
 
-  /** Sets the CppSemantics for this compile. */
-  @CanIgnoreReturnValue
-  public CppCompileActionBuilder setSemantics(CppSemantics semantics) {
-    this.cppSemantics = semantics;
-    return this;
-  }
-
   @CanIgnoreReturnValue
   public CppCompileActionBuilder setShareable(boolean shareable) {
     this.shareable = shareable;

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java
@@ -62,7 +62,11 @@ public static CppCompileAction createLinkstampCompileAction(
       CppSemantics semantics) {
     CppCompileActionBuilder builder =
         new CppCompileActionBuilder(
-                actionConstructionContext, grepIncludes, ccToolchainProvider, configuration)
+                actionConstructionContext,
+                grepIncludes,
+                ccToolchainProvider,
+                configuration,
+                semantics)
             .addMandatoryInputs(compilationInputs)
             .setVariables(
                 getVariables(
@@ -83,7 +87,6 @@ public static CppCompileAction createLinkstampCompileAction(
                     semantics))
             .setFeatureConfiguration(featureConfiguration)
             .setSourceFile(sourceFile)
-            .setSemantics(semantics)
             .setOutputs(outputFile, /* dotdFile= */ null, /* diagnosticsFile= */ null)
             .setInputsForInvalidation(inputsForInvalidation)
             .setBuiltinIncludeFiles(buildInfoHeaderArtifacts)