RELNOTES: Allow C++ features to make proto_library emit smaller C++ code

PiperOrigin-RevId: 189589977

1 files changed, 13 insertions, 6 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 20ac616e1b..d4684d9a7f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -648,6 +648,18 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     }
     return null;
   }
+  
+  protected final ActionAnalysisMetadata getGeneratingActionAnalysisMetadata(Artifact artifact) {
+    Preconditions.checkNotNull(artifact);
+    ActionAnalysisMetadata actionAnalysisMetadata =
+        mutableActionGraph.getGeneratingAction(artifact);
+
+    if (actionAnalysisMetadata == null) {
+      actionAnalysisMetadata = getActionGraph().getGeneratingAction(artifact);
+    }
+
+    return actionAnalysisMetadata;
+  }
 
   protected Action getGeneratingAction(ConfiguredTarget target, String outputName) {
     NestedSet<Artifact> filesToBuild = getFilesToBuild(target);
@@ -666,12 +678,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
   }
 
   protected final Action getGeneratingAction(Artifact artifact) {
-    Preconditions.checkNotNull(artifact);
-    ActionAnalysisMetadata action = mutableActionGraph.getGeneratingAction(artifact);
-
-    if (action == null) {
-      action = getActionGraph().getGeneratingAction(artifact);
-    }
+    ActionAnalysisMetadata action = getGeneratingActionAnalysisMetadata(artifact);
 
     if (action != null) {
       Preconditions.checkState(