Do not NPE crash when C++ actions are not configured in crosstool

Show meaningful message instead. RELNOTES: None. PiperOrigin-RevId: 161196096
dotordogh · Jul 7, 2017 · 7d58bdc · 7d58bdc
1 parent 2936047
commit 7d58bdc
Show file tree

Hide file tree

Showing 14 changed files with 410 additions and 198 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/ActionTemplate.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/ActionTemplate.java
@@ -53,6 +53,15 @@
  * </ol>
  */
 public interface ActionTemplate<T extends Action> extends ActionAnalysisMetadata {
+
+  /** An exception signalling that the template expansion failed during execution phase */
+  class ActionTemplateExpansionException extends Exception {
+
+    public ActionTemplateExpansionException(String cause) {
+      super(cause);
+    }
+  }
+
   /**
    * Given a list of input TreeFileArtifacts resolved at execution time, returns a list of expanded
    * SpawnActions to be executed.
@@ -65,7 +74,8 @@ public interface ActionTemplate<T extends Action> extends ActionAnalysisMetadata
    *     {@link TreeFileArtifact}
    */
   Iterable<T> generateActionForInputArtifacts(
-      Iterable<TreeFileArtifact> inputTreeFileArtifacts, ArtifactOwner artifactOwner);
+      Iterable<TreeFileArtifact> inputTreeFileArtifacts, ArtifactOwner artifactOwner)
+      throws ActionTemplateExpansionException;
 
   /** Returns the input TreeArtifact. */
   Artifact getInputTreeArtifact();

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -39,6 +39,7 @@
 import com.google.devtools.build.lib.packages.TargetUtils;
 import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.rules.apple.Platform;
+import com.google.devtools.build.lib.rules.cpp.CcLibraryHelper.Info;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration.DynamicMode;
 import com.google.devtools.build.lib.rules.cpp.Link.LinkStaticness;
@@ -236,6 +237,7 @@ public static ConfiguredTarget init(CppSemantics semantics, RuleContext ruleCont
         determineLinkerArguments(
             ruleContext,
             ccToolchain,
+            featureConfiguration,
             fdoSupport,
             common,
             precompiledFiles,
@@ -268,7 +270,6 @@ public static ConfiguredTarget init(CppSemantics semantics, RuleContext ruleCont
     linkActionBuilder.setLinkType(linkType);
     linkActionBuilder.setLinkStaticness(linkStaticness);
     linkActionBuilder.setFake(fake);
-    linkActionBuilder.setFeatureConfiguration(featureConfiguration);
 
     if (CppLinkAction.enableSymbolsCounts(cppConfiguration, fake, linkType)) {
       linkActionBuilder.setSymbolCountsOutput(ruleContext.getBinArtifact(
@@ -450,10 +451,11 @@ public static ConfiguredTarget init(CppSemantics semantics, RuleContext ruleCont
   private static CppLinkActionBuilder determineLinkerArguments(
       RuleContext context,
       CcToolchainProvider toolchain,
+      FeatureConfiguration featureConfiguration,
       FdoSupportProvider fdoSupport,
       CcCommon common,
       PrecompiledFiles precompiledFiles,
-      CcLibraryHelper.Info info,
+      Info info,
       ImmutableSet<Artifact> compilationPrerequisites,
       boolean fake,
       Artifact binary,
@@ -462,7 +464,7 @@ private static CppLinkActionBuilder determineLinkerArguments(
       boolean linkCompileOutputSeparately)
       throws InterruptedException {
     CppLinkActionBuilder builder =
-        new CppLinkActionBuilder(context, binary, toolchain, fdoSupport)
+        new CppLinkActionBuilder(context, binary, toolchain, fdoSupport, featureConfiguration)
             .setCrosstoolInputs(toolchain.getLink())
             .addNonCodeInputs(compilationPrerequisites);