commit 7c7a7019b98a4cd21e8aa229eb0c2914ce2976a9
author mstaib <mstaib@google.com> Tue Apr 23 16:19:09 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 23 16:20:27 2019 -0700
tree 8454267c7520ebbd283e0d4d04ae4542970f9c7a
parent 3c6bf10668c9d9043458ee225cd55179d3ea07d3

Add safety checks for aspects.

As aspects are not currently supported in retroactive trimming mode, these
checks ensure that they are not silently executed incorrectly.

Progress on #6524.

PiperOrigin-RevId: 244946454

src/main/java/com/google/devtools/build/lib/analysis/BuildView.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index bc1dff2..33d20e1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -324,6 +324,11 @@
 
         String skylarkFunctionName = aspect.substring(delimiterPosition + 1);
         for (TargetAndConfiguration targetSpec : topLevelTargetsWithConfigs) {
+          if (targetSpec.getConfiguration() != null
+              && targetSpec.getConfiguration().trimConfigurationsRetroactively()) {
+            throw new ViewCreationFailedException(
+                "Aspects were requested, but are not supported in retroactive trimming mode.");
+          }
           aspectConfigurations.put(
               Pair.of(targetSpec.getLabel(), aspect), targetSpec.getConfiguration());
           aspectKeys.add(
@@ -342,6 +347,11 @@
 
         if (aspectFactoryClass != null) {
           for (TargetAndConfiguration targetSpec : topLevelTargetsWithConfigs) {
+            if (targetSpec.getConfiguration() != null
+                && targetSpec.getConfiguration().trimConfigurationsRetroactively()) {
+              throw new ViewCreationFailedException(
+                  "Aspects were requested, but are not supported in retroactive trimming mode.");
+            }
             // For invoking top-level aspects, use the top-level configuration for both the
             // aspect and the base target while the top-level configuration is untrimmed.
             BuildConfiguration configuration = targetSpec.getConfiguration();