commit 961b176e1f26b187185eb903626fd312da6f7288
author cmita <cmita@google.com> Tue May 25 03:04:22 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 25 03:05:45 2021 -0700
tree 4209c7f418eb5a5d84c6ae451875cdce7b002876
parent 4c96964b4221436ff1630f65ce21dba374149d44

Fix loading of Starlark aspects in builtins.

PiperOrigin-RevId: 375664574

src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index aead10e..62b456b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -155,7 +155,10 @@
   static StarlarkAspect loadStarlarkAspect(
       Environment env, Label extensionLabel, String starlarkValueName)
       throws AspectCreationException, InterruptedException {
-    SkyKey importFileKey = BzlLoadValue.keyForBuild(extensionLabel);
+    SkyKey importFileKey =
+        StarlarkBuiltinsValue.isBuiltinsRepo(extensionLabel.getRepository())
+            ? BzlLoadValue.keyForBuiltins(extensionLabel)
+            : BzlLoadValue.keyForBuild(extensionLabel);
     try {
       BzlLoadValue bzlLoadValue =
           (BzlLoadValue) env.getValueOrThrow(importFileKey, BzlLoadFailedException.class);