Flip --enable_bzlmod

MODULE.bazel

@@ -247,6 +247,7 @@ bazel_build_deps = use_extension("//:extensions.bzl", "bazel_build_deps")
 use_repo(
     bazel_build_deps,
     "bootstrap_repo_cache",
+    "bazel_tools_repo_cache",
     "debian_cc_deps",
     "openjdk_linux_aarch64_vanilla",
     "openjdk_linux_ppc64le_vanilla",

distdir.bzl

@@ -20,9 +20,15 @@ load("//tools/build_defs/repo:http.bzl", "http_archive", "http_file", "http_jar"
 _BUILD = """
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 
+filegroup(
+  name="files",
+  srcs = {srcs},
+  visibility = ["//visibility:public"],
+)
+
 pkg_tar(
   name="archives",
-  srcs = {srcs},
+  srcs = [":files"],
   strip_prefix = "{strip_prefix}",
   package_dir = "{dirname}",
   visibility = ["//visibility:public"],

extensions.bzl

@@ -19,6 +19,7 @@
 load("//:distdir.bzl", "dist_http_archive", "repo_cache_tar")
 load("//:distdir_deps.bzl", "DIST_ARCHIVE_REPOS")
 load("//:repositories.bzl", "embedded_jdk_repositories")
+load("//src/tools/bzlmod:utils.bzl", "parse_bazel_module_repos")
 load("//src/main/res:winsdk_configure.bzl", "winsdk_configure")
 load("//src/test/shell/bazel:list_source_repository.bzl", "list_source_repository")
 load("//tools/distributions/debian:deps.bzl", "debian_deps")
@@ -28,6 +29,8 @@ def _bazel_build_deps(_ctx):
     embedded_jdk_repositories()
     debian_deps()
     repo_cache_tar(name = "bootstrap_repo_cache", repos = DIST_ARCHIVE_REPOS, dirname = "derived/repository_cache")
+    BAZEL_TOOLS_DEPS_REPOS = parse_bazel_module_repos(_ctx, _ctx.path(Label("//src/test/tools/bzlmod:MODULE.bazel.lock")))
+    repo_cache_tar(name = "bazel_tools_repo_cache", repos = BAZEL_TOOLS_DEPS_REPOS, lockfile = "//src/test/tools/bzlmod:MODULE.bazel.lock")
 
 bazel_build_deps = module_extension(implementation = _bazel_build_deps)
 

src/BUILD

@@ -586,5 +586,5 @@ filegroup(
         "@remotejdk%s_%s//:WORKSPACE" % (version, os)
         for version in ("17", "20")
         for os in ("macos", "macos_aarch64", "linux", "win")
-    ],
+    ] + ["@bazel_tools_repo_cache//:files"],
 )

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

@@ -17,14 +17,12 @@
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.analysis.BlazeVersionInfo;
 import com.google.devtools.build.lib.bazel.BazelVersion;
 import com.google.devtools.build.lib.bazel.bzlmod.InterimModule.DepSpec;
@@ -46,7 +44,6 @@
 import com.google.devtools.build.skyframe.SkyframeLookupResult;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import javax.annotation.Nullable;
 
 /**
@@ -122,8 +119,6 @@ private static Selection.Result discoverAndSelect(Environment env, RootModuleFil
       return null;
     }
 
-    verifyAllOverridesAreOnExistentModules(initialDepGraph, root.getOverrides());
-
     Selection.Result selectionResult;
     try (SilentCloseable c = Profiler.instance().profile(ProfilerTask.BZLMOD, "selection")) {
       selectionResult = Selection.run(initialDepGraph, root.getOverrides());
@@ -157,23 +152,6 @@ private static Selection.Result discoverAndSelect(Environment env, RootModuleFil
     return selectionResult;
   }
 
-  private static void verifyAllOverridesAreOnExistentModules(
-      ImmutableMap<ModuleKey, InterimModule> initialDepGraph,
-      ImmutableMap<String, ModuleOverride> overrides)
-      throws BazelModuleResolutionFunctionException {
-    ImmutableSet<String> existentModules =
-        initialDepGraph.values().stream().map(InterimModule::getName).collect(toImmutableSet());
-    Set<String> nonexistentModules = Sets.difference(overrides.keySet(), existentModules);
-    if (!nonexistentModules.isEmpty()) {
-      throw new BazelModuleResolutionFunctionException(
-          ExternalDepsException.withMessage(
-              Code.BAD_MODULE,
-              "the root module specifies overrides on nonexistent module(s): %s",
-              Joiner.on(", ").join(nonexistentModules)),
-          Transience.PERSISTENT);
-    }
-  }
-
   private static void verifyRootModuleDirectDepsAreAccurate(
       InterimModule discoveredRootModule,
       InterimModule resolvedRootModule,

src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java

@@ -197,7 +197,7 @@ public final class BuildLanguageOptions extends OptionsBase {
   @Option(
       name = "enable_bzlmod",
       oldName = "experimental_enable_bzlmod",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = OptionEffectTag.LOADING_AND_ANALYSIS,
       help =
@@ -821,7 +821,7 @@ public StarlarkSemantics toStarlarkSemantics() {
   public static final String EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS =
       "-experimental_enable_android_migration_apis";
   public static final String EXPERIMENTAL_ENABLE_SCL_DIALECT = "-experimental_enable_scl_dialect";
-  public static final String ENABLE_BZLMOD = "-enable_bzlmod";
+  public static final String ENABLE_BZLMOD = "+enable_bzlmod";
   public static final String EXPERIMENTAL_ISOLATED_EXTENSION_USAGES =
       "-experimental_isolated_extension_usages";
   public static final String INCOMPATIBLE_EXISTING_RULES_IMMUTABLE_VIEW =

src/main/java/com/google/devtools/build/lib/skyframe/packages/BUILD

@@ -80,6 +80,10 @@ java_library(
         ":AbstractPackageLoader",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
         "//src/main/java/com/google/devtools/build/lib/bazel:repository_module",
+        "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:registry",
+        "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:repo_rule_value",
+        "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:resolution_impl",
+        "//src/main/java/com/google/devtools/build/lib/bazel/repository:repository_options",
         "//src/main/java/com/google/devtools/build/lib/bazel/repository/cache",
         "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader",
         "//src/main/java/com/google/devtools/build/lib/bazel/repository/starlark",

src/main/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoader.java

@@ -18,6 +18,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.bazel.BazelRepositoryModule;
+import com.google.devtools.build.lib.bazel.bzlmod.*;
+import com.google.devtools.build.lib.bazel.repository.RepositoryOptions;
 import com.google.devtools.build.lib.bazel.repository.cache.RepositoryCache;
 import com.google.devtools.build.lib.bazel.repository.downloader.DownloadManager;
 import com.google.devtools.build.lib.bazel.repository.downloader.HttpDownloader;
@@ -98,7 +100,23 @@ private Builder(Root workspaceDir, Path installBase, Path outputBase, AtomicBool
               RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE, Optional.empty()),
           PrecomputedValue.injected(
               RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING,
-              RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY));
+              RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY),
+          PrecomputedValue.injected(ModuleFileFunction.MODULE_OVERRIDES, ImmutableMap.of()),
+          PrecomputedValue.injected(
+              RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_CONFIGURING,
+              RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY),
+          PrecomputedValue.injected(ModuleFileFunction.REGISTRIES, ImmutableList.of()),
+          PrecomputedValue.injected(ModuleFileFunction.IGNORE_DEV_DEPS, false),
+          PrecomputedValue.injected(
+              BazelModuleResolutionFunction.CHECK_DIRECT_DEPENDENCIES,
+              RepositoryOptions.CheckDirectDepsMode.OFF),
+          PrecomputedValue.injected(
+              BazelModuleResolutionFunction.BAZEL_COMPATIBILITY_MODE,
+              RepositoryOptions.BazelCompatibilityMode.OFF),
+          PrecomputedValue.injected(
+              BazelLockFileFunction.LOCKFILE_MODE, RepositoryOptions.LockfileMode.OFF),
+          PrecomputedValue.injected(
+              YankedVersionsUtil.ALLOWED_YANKED_VERSIONS, ImmutableList.of()));
     }
 
     @Override
@@ -107,6 +125,17 @@ public BazelPackageLoader buildImpl() {
       RepositoryCache repositoryCache = new RepositoryCache();
       HttpDownloader httpDownloader = new HttpDownloader();
       DownloadManager downloadManager = new DownloadManager(repositoryCache, httpDownloader);
+      RegistryFactory registryFactory =
+          new RegistryFactoryImpl(directories.getWorkspace(), downloadManager, Suppliers.ofInstance(ImmutableMap.of()));
+
+      // Allow tests to override SkyFunctions.MODULE_FILE to use fake registry
+      if (!this.extraSkyFunctions.containsKey(SkyFunctions.MODULE_FILE)) {
+        addExtraSkyFunctions(ImmutableMap.of(
+            SkyFunctions.MODULE_FILE,
+            new ModuleFileFunction(registryFactory, directories.getWorkspace(), ImmutableMap.of())
+        ));
+      }
+
       addExtraSkyFunctions(
           ImmutableMap.<SkyFunctionName, SkyFunction>builder()
               .put(
@@ -129,6 +158,8 @@ public BazelPackageLoader buildImpl() {
                       ImmutableMap::of,
                       directories,
                       EXTERNAL_PACKAGE_HELPER))
+              .put(SkyFunctions.BAZEL_DEP_GRAPH, new BazelDepGraphFunction())
+              .put(SkyFunctions.BAZEL_MODULE_RESOLUTION, new BazelModuleResolutionFunction())
               .build());
 
       return new BazelPackageLoader(this);

src/test/java/com/google/devtools/build/lib/analysis/AutoExecGroupsTest.java

@@ -754,7 +754,7 @@ public void defaultExecGroupHasBasicExecutionPlatform(String action) throws Exce
   public void toolchainParameterAsLabel_correctParsingOfToolchain(String action) throws Exception {
     createCustomRule(
         /* action= */ action,
-        /* actionParameters= */ "toolchain = Label('@//rule:toolchain_type_1'),",
+        /* actionParameters= */ "toolchain = Label('@@//rule:toolchain_type_1'),",
         /* extraAttributes= */ "",
         /* toolchains= */ "['//rule:toolchain_type_1', '//rule:toolchain_type_2']",
         /* execGroups= */ "",
@@ -776,7 +776,7 @@ public void toolchainParameterAsLabel_correctParsingOfToolchain(String action) t
   public void toolchainParameterAsString_correctParsingOfToolchain(String action) throws Exception {
     createCustomRule(
         /* action= */ action,
-        /* actionParameters= */ "toolchain = '@//rule:toolchain_type_1',",
+        /* actionParameters= */ "toolchain = '@@//rule:toolchain_type_1',",
         /* extraAttributes= */ "",
         /* toolchains= */ "['//rule:toolchain_type_1', '//rule:toolchain_type_2']",
         /* execGroups= */ "",
@@ -1828,8 +1828,8 @@ public void ccCommonLink_cppLTOActionExecutesOnFirstPlatform() throws Exception
             mockToolsConfig,
             CcToolchainConfig.builder()
                 .withFeatures(CppRuleClasses.THIN_LTO, CppRuleClasses.SUPPORTS_START_END_LIB)
-                .withToolchainTargetConstraints("@//platforms:constraint_1")
-                .withToolchainExecConstraints("@//platforms:constraint_1"));
+                .withToolchainTargetConstraints("@@//platforms:constraint_1")
+                .withToolchainExecConstraints("@@//platforms:constraint_1"));
 
     ImmutableList<Action> actions = getActions("//test:custom_rule_name", CppLinkAction.class);
     ImmutableList<Action> cppLTOActions =
@@ -2004,8 +2004,8 @@ public void ccCommonCompile_moduleActionsExecuteOnFirstPlatform() throws Excepti
             mockToolsConfig,
             CcToolchainConfig.builder()
                 .withFeatures(MockCcSupport.HEADER_MODULES_FEATURES)
-                .withToolchainTargetConstraints("@//platforms:constraint_1")
-                .withToolchainExecConstraints("@//platforms:constraint_1"));
+                .withToolchainTargetConstraints("@@//platforms:constraint_1")
+                .withToolchainExecConstraints("@@//platforms:constraint_1"));
 
     ImmutableList<Action> cppCompileActions =
         getActions("//bazel_internal/test_rules/cc:custom_rule_name", CppCompileAction.class);
@@ -2075,8 +2075,8 @@ public void ccCommonCompile_codeGenModuleActionExecutesOnFirstPlatform() throws
             mockToolsConfig,
             CcToolchainConfig.builder()
                 .withFeatures(MockCcSupport.HEADER_MODULES_FEATURES)
-                .withToolchainTargetConstraints("@//platforms:constraint_1")
-                .withToolchainExecConstraints("@//platforms:constraint_1"));
+                .withToolchainTargetConstraints("@@//platforms:constraint_1")
+                .withToolchainExecConstraints("@@//platforms:constraint_1"));
 
     ImmutableList<Action> cppCompileActions =
         getActions("//bazel_internal/test_rules/cc:custom_rule_name", CppCompileAction.class);
@@ -2141,8 +2141,8 @@ public void ccCommonCompile_compileHeaderActionExecutesOnFirstPlatform() throws
             mockToolsConfig,
             CcToolchainConfig.builder()
                 .withFeatures(CppRuleClasses.PARSE_HEADERS)
-                .withToolchainTargetConstraints("@//platforms:constraint_1")
-                .withToolchainExecConstraints("@//platforms:constraint_1"));
+                .withToolchainTargetConstraints("@@//platforms:constraint_1")
+                .withToolchainExecConstraints("@@//platforms:constraint_1"));
 
     ImmutableList<Action> cppCompileActions =
         getActions("//bazel_internal/test_rules/cc:custom_rule_name", CppCompileAction.class);

src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderIntegrationTest.java

@@ -117,6 +117,7 @@ public void locations_spaces() throws Exception {
 
   @Test
   public void otherPathExpansion() throws Exception {
+    setBuildLanguageOptions("--noenable_bzlmod");
     scratch.file(
         "expansion/BUILD",
         "genrule(name='foo', outs=['foo.txt'], cmd='never executed')",
@@ -262,6 +263,6 @@ public void otherPathMultiExpansion() throws Exception {
     assertThat(expander.expand("foo $(rlocationpaths :foo) bar"))
         .isEqualTo(
             "foo __main__/expansion/bar.txt __main__/expansion/foo.txt bar"
-                .replace("__main__", TestConstants.WORKSPACE_NAME));
+                .replace("__main__", TestConstants.WORKSPACE_NAME_BZLMOD));
   }
 }