Automated rollback of commit 1af9b1e2238c3b43a2b66233495ecf7b6ef4dcab.

*** Reason for rollback ***

Reason for previous rollback was identified as being a memory regression causing some cases to hit java heap limit.  Proposal is to increase java heap limit to compensate and just go with the original change.

*** Original change description ***

Automated rollback of commit 6cfffdf37e11018c7e6e2cabc90440d6d29c819b.

PiperOrigin-RevId: 166426608

2 files changed, 44 insertions, 6 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
index e8533552a5..2c4026e678 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
@@ -568,7 +568,9 @@ public class AppleBinaryTest extends ObjcRuleTestCase {
     assertThat(getFirstArtifactEndingWith(binObjectFiles, "DataB.pbobjc.o")).isNull();
     Action dataAObjectAction =
         getGeneratingAction(getFirstArtifactEndingWith(binObjectFiles, "DataA.pbobjc.o"));
-    assertThat(getFirstArtifactEndingWith(dataAObjectAction.getInputs(), "DataB.pbobjc.h"))
+    assertThat(
+            getFirstArtifactEndingWith(
+                getExpandedActionInputs(dataAObjectAction), "DataB.pbobjc.h"))
         .isNotNull();
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index e0d84bc43a..2f4d819a36 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -91,6 +91,7 @@ import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.apple.DottedVersion;
 import com.google.devtools.build.lib.rules.apple.XcodeVersionProperties;
+import com.google.devtools.build.lib.rules.cpp.CppCompileAction;
 import com.google.devtools.build.lib.rules.cpp.CppLinkAction;
 import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs;
 import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode;
@@ -1359,6 +1360,9 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
     assertOnlyRequiredInputsArePresentForBundledCompilation(topTarget);
     assertCoptsAndDefinesForBundlingTarget(topTarget);
     assertBundledGroupsGetCreatedAndLinked(topTarget);
+    if (getObjcCrosstoolMode() == ObjcCrosstoolMode.ALL) {
+      assertBundledCompilationUsesCrosstool(topTarget);
+    }
   }
 
   protected ImmutableList<Artifact> getAllObjectFilesLinkedInBin(Artifact bin) {
@@ -1457,6 +1461,22 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
         .doesNotContain("protos/data_b.proto");
   }
 
+  /**
+   * Ensures that all middleman artifacts in the action input are expanded so that the real inputs
+   * are also included.
+   */
+  protected Iterable<Artifact> getExpandedActionInputs(Action action) {
+    List<Artifact> containedArtifacts = new ArrayList<>();
+    for (Artifact input : action.getInputs()) {
+      if (input.isMiddlemanArtifact()) {
+        Action middlemanAction = getGeneratingAction(input);
+        Iterables.addAll(containedArtifacts, getExpandedActionInputs(middlemanAction));
+      }
+      containedArtifacts.add(input);
+    }
+    return containedArtifacts;
+  }
+
   private void assertOnlyRequiredInputsArePresentForBundledCompilation(ConfiguredTarget topTarget) {
     Artifact protoHeaderA = getBinArtifact("_generated_protos/x/protos/DataA.pbobjc.h", topTarget);
     Artifact protoHeaderB = getBinArtifact("_generated_protos/x/protos/DataB.pbobjc.h", topTarget);
@@ -1482,15 +1502,15 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
     assertThat(protoObjectActionC).isNotNull();
     assertThat(protoObjectActionD).isNotNull();
 
-    assertThat(protoObjectActionA.getInputs())
+    assertThat(getExpandedActionInputs(protoObjectActionA))
         .containsNoneOf(protoHeaderB, protoHeaderC, protoHeaderD);
-    assertThat(protoObjectActionB.getInputs())
+    assertThat(getExpandedActionInputs(protoObjectActionB))
         .containsNoneOf(protoHeaderA, protoHeaderC, protoHeaderD);
-    assertThat(protoObjectActionC.getInputs())
+    assertThat(getExpandedActionInputs(protoObjectActionC))
         .containsNoneOf(protoHeaderA, protoHeaderB, protoHeaderD);
-    assertThat(protoObjectActionD.getInputs())
+    assertThat(getExpandedActionInputs(protoObjectActionD))
         .containsAllOf(protoHeaderA, protoHeaderC, protoHeaderD);
-    assertThat(protoObjectActionD.getInputs())
+    assertThat(getExpandedActionInputs(protoObjectActionD))
         .doesNotContain(protoHeaderB);
   }
 
@@ -1534,6 +1554,22 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
         .containsAllOf(protosGroup0Lib, protosGroup1Lib, protosGroup2Lib, protosGroup3Lib);
   }
 
+  private void assertBundledCompilationUsesCrosstool(ConfiguredTarget topTarget) {
+    Artifact protoObjectA =
+        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataA.pbobjc.o", topTarget);
+    Artifact protoObjectB =
+        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataB.pbobjc.o", topTarget);
+    Artifact protoObjectC =
+        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataC.pbobjc.o", topTarget);
+    Artifact protoObjectD =
+        getBinArtifact("_objs/x/x/_generated_protos/x/protos/DataD.pbobjc.o", topTarget);
+
+    assertThat(getGeneratingAction(protoObjectA)).isInstanceOf(CppCompileAction.class);
+    assertThat(getGeneratingAction(protoObjectB)).isInstanceOf(CppCompileAction.class);
+    assertThat(getGeneratingAction(protoObjectC)).isInstanceOf(CppCompileAction.class);
+    assertThat(getGeneratingAction(protoObjectD)).isInstanceOf(CppCompileAction.class);
+  }
+
   protected void checkProtoBundlingDoesNotHappen(RuleType ruleType) throws Exception {
     scratch.file(
         "protos/BUILD",