[7.2.0] Share Starlark env across module and repo files

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java

@@ -376,7 +376,7 @@ private static ModuleThreadContext execModuleFile(
           .check(starlarkFile);
       net.starlark.java.eval.Module predeclaredEnv =
           net.starlark.java.eval.Module.withPredeclared(
-              starlarkSemantics, starlarkEnv.getStarlarkGlobals().getModuleToplevels());
+              starlarkSemantics, starlarkEnv.getModuleBazelEnv());
       Program program = Program.compileFile(starlarkFile, predeclaredEnv);
       StarlarkThread thread = new StarlarkThread(mu, starlarkSemantics);
       context.storeInThread(thread);

src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkEnvironment.java

@@ -94,6 +94,12 @@ public final class BazelStarlarkEnvironment {
   /** The top-level predeclared symbols for a bzl module in the {@code @_builtins} pseudo-repo. */
   private final ImmutableMap<String, Object> builtinsBzlEnv;
 
+  /** The top-level predeclared symbols for a MODULE.bazel file. */
+  private final ImmutableMap<String, Object> moduleBazelEnv;
+
+  /** The top-level predeclared symbols for a REPO.bazel file. */
+  private final ImmutableMap<String, Object> repoBazelEnv;
+
   /**
    * Constructs a new {@code BazelStarlarkEnvironment} that will have complete knowledge of the
    * proper Starlark symbols available in each context, with and without injection.
@@ -141,6 +147,8 @@ public BazelStarlarkEnvironment(
             uninjectedBuildBzlEnv);
     this.uninjectedBuildEnv =
         createUninjectedBuildEnv(starlarkGlobals, ruleFunctions, registeredBuildFileToplevels);
+    this.moduleBazelEnv = starlarkGlobals.getModuleToplevels();
+    this.repoBazelEnv = starlarkGlobals.getRepoToplevels();
   }
 
   /**
@@ -206,6 +214,16 @@ public ImmutableMap<String, Object> getBuiltinsBzlEnv() {
     return builtinsBzlEnv;
   }
 
+  /** Returns the environment for MODULE.bazel files. */
+  public ImmutableMap<String, Object> getModuleBazelEnv() {
+    return moduleBazelEnv;
+  }
+
+  /** Returns the environment for REPO.bazel files. */
+  public ImmutableMap<String, Object> getRepoBazelEnv() {
+    return repoBazelEnv;
+  }
+
   private static ImmutableMap<String, Object> createBzlToplevelsWithoutNative(
       StarlarkGlobals starlarkGlobals, Map<String, Object> registeredBzlToplevels) {
     ImmutableMap.Builder<String, Object> env = new ImmutableMap.Builder<>();

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

@@ -150,9 +150,7 @@ private PackageArgs evalRepoFile(
     try (Mutability mu = Mutability.create("repo file", repoName)) {
       new DotBazelFileSyntaxChecker("REPO.bazel files", /* canLoadBzl= */ false)
           .check(starlarkFile);
-      Module predeclared =
-          Module.withPredeclared(
-              starlarkSemantics, starlarkEnv.getStarlarkGlobals().getRepoToplevels());
+      Module predeclared = Module.withPredeclared(starlarkSemantics, starlarkEnv.getRepoBazelEnv());
       Program program = Program.compileFile(starlarkFile, predeclared);
       StarlarkThread thread = new StarlarkThread(mu, starlarkSemantics);
       thread.setPrintHandler(Event.makeDebugPrintHandler(handler));