1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
index a40bacb549..d22857e84d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
@@ -387,6 +387,14 @@ public final class SkylarkRuleConfiguredTargetUtil {
         defaultRunfiles = cast("default_runfiles", provider, Runfiles.class, loc);
       } else if (field.equals("executable")) {
         executable = cast("executable", provider, Artifact.class, loc);
+        if (!executable.getArtifactOwner().equals(context.getRuleContext().getOwner())) {
+          throw new EvalException(
+              loc,
+              String.format(
+                  "'executable' provided by an executable rule '%s' should be created "
+                      + "by the same rule.",
+                  context.getRuleContext().getRule().getRuleClass()));
+        }
       } else if (provider
           .getProvider()
           .getKey()