Automated rollback of commit b284477.

*** Reason for rollback ***

Roll forward with fix and tests

*** Original change description ***

Automated rollback of commit 9353955.

PiperOrigin-RevId: 520772713
Change-Id: I75ad3a7de340f4d43856f3540b386297664fdd50

scripts/packages/BUILD

@@ -6,8 +6,8 @@ filegroup(
     name = "srcs",
     srcs = glob(["**"]) + [
         "//scripts/packages/debian:srcs",
-        "//scripts/packages/dmg:srcs",
         "//scripts/packages/fedora:srcs",
+        "//scripts/packages/dmg:srcs",
     ],
     visibility = [
         "//scripts:__pkg__",
@@ -25,14 +25,14 @@ filegroup(
         "//src/conditions:freebsd": [],
         "//src/conditions:openbsd": [],
         "//src/conditions:darwin": [
-            ":generate-package-info",
             ":with-jdk/install.sh",
             ":without-jdk/install.sh",
+            ":generate-package-info",
         ],
         "//conditions:default": [
-            ":generate-package-info",
             ":with-jdk/install.sh",
             ":without-jdk/install.sh",
+            ":generate-package-info",
             "//:bazel-distfile",
             "//scripts/packages/debian:bazel-debian",
             "//scripts/packages/debian:bazel-debian-src",

src/BUILD

@@ -90,33 +90,33 @@ JAVA_TOOLS = [
     srcs = JAVA_TOOLS + [
                "BUILD.tools",
                "MODULE.tools",
-               "//src/conditions:embedded_tools",
-               "//src/main/cpp/util:embedded_tools",
-               "//src/main/native:embedded_tools",
-               "//src/main/protobuf:srcs",
-               "//src/tools/android/java/com/google/devtools/build/android:embedded_tools",
-               "//src/tools/launcher:srcs",
+               "//tools:embedded_tools_srcs",
                "//third_party:gpl-srcs",
-               "//third_party/def_parser:srcs",
                "//third_party/grpc:embedded_tools_srcs",
                "//third_party/grpc/bazel:embedded_tools_srcs",
                "//third_party/ijar:embedded_zipper_sources",
                "//third_party/ijar:zipper",
                "//third_party/java/j2objc:embedded_tools_srcs",
                "//third_party/py/abseil:srcs",
                "//third_party/py/six:srcs",
+               "//src/conditions:embedded_tools",
+               "//src/tools/android/java/com/google/devtools/build/android:embedded_tools",
+               "//src/tools/launcher:srcs",
+               "//src/main/cpp/util:embedded_tools",
+               "//src/main/native:embedded_tools",
+               "//src/main/protobuf:srcs",
+               "//third_party/def_parser:srcs",
                "//third_party/zlib:embedded_tools",
-               "//tools:embedded_tools_srcs",
            ] + select({
                "//src/conditions:darwin": [
                    "//tools/osx:xcode_locator.m",
                ],
                "//conditions:default": [],
            }) + select({
                "//src/conditions:windows": [
-                   "//src/tools/launcher",
+                   "//src/tools/launcher:launcher",
                    "//src/tools/launcher:launcher_maker",
-                   "//third_party/def_parser",
+                   "//third_party/def_parser:def_parser",
                ],
                "//conditions:default": [],
            }) +
@@ -339,6 +339,7 @@ filegroup(
         "//src/java_tools/junitrunner/javatests/com/google/testing/coverage:srcs",
         "//src/java_tools/singlejar:srcs",
         "//src/main/cpp:srcs",
+        "//src/main/res:srcs",
         "//src/main/java/com/google/devtools/build/docgen:srcs",
         "//src/main/java/com/google/devtools/build/lib:srcs",
         "//src/main/java/com/google/devtools/build/lib/includescanning:srcs",
@@ -348,15 +349,16 @@ filegroup(
         "//src/main/java/com/google/devtools/build/skyframe:srcs",
         "//src/main/java/com/google/devtools/common/options:srcs",
         "//src/main/java/net/starlark/java/cmd:srcs",
-        "//src/main/java/net/starlark/java/lib/json:srcs",
         "//src/main/java/net/starlark/java/spelling:srcs",
+        "//src/main/java/net/starlark/java/lib/json:srcs",
         "//src/main/native:srcs",
         "//src/main/protobuf:srcs",
-        "//src/main/res:srcs",
         "//src/main/starlark/builtins_bzl:srcs",
         "//src/main/tools:srcs",
         "//src/test/cpp:srcs",
         "//src/test/gen:srcs",
+        "//src/test/res:srcs",
+        "//src/test/native/windows:srcs",
         "//src/test/java/com/google/devtools/build/android:srcs",
         "//src/test/java/com/google/devtools/build/docgen:srcs",
         "//src/test/java/com/google/devtools/build/lib:srcs",
@@ -366,20 +368,18 @@ filegroup(
         "//src/test/java/com/google/devtools/common/options:srcs",
         "//src/test/java/net/starlark/java/eval:srcs",
         "//src/test/java/net/starlark/java/spelling:srcs",
-        "//src/test/native/windows:srcs",
         "//src/test/py/bazel:srcs",
-        "//src/test/res:srcs",
         "//src/test/shell:srcs",
         "//src/test/testdata/test_tls_certificate",
         "//src/test/tools:srcs",
         "//src/tools/android:srcs",
         "//src/tools/android/java/com/google/devtools/build/android:srcs",
         "//src/tools/execlog:srcs",
+        "//src/tools/workspacelog:srcs",
         "//src/tools/launcher:srcs",
-        "//src/tools/remote:srcs",
-        "//src/tools/singlejar:srcs",
         "//src/tools/starlark/java/com/google/devtools/starlark/common:srcs",
-        "//src/tools/workspacelog:srcs",
+        "//src/tools/singlejar:srcs",
+        "//src/tools/remote:srcs",
         "//tools/osx:srcs",
     ],
     visibility = ["//:__pkg__"],
@@ -564,13 +564,13 @@ filegroup(
         "@bazel_skylib//:WORKSPACE",
         "@com_google_protobuf//:WORKSPACE",
         "@remote_coverage_tools//:WORKSPACE",
-        "@remote_java_tools_darwin_arm64_for_testing//:WORKSPACE",
         "@remote_java_tools_darwin_x86_64_for_testing//:WORKSPACE",
+        "@remote_java_tools_darwin_arm64_for_testing//:WORKSPACE",
         "@remote_java_tools_for_testing//:WORKSPACE",
         "@remote_java_tools_linux_for_testing//:WORKSPACE",
         "@remote_java_tools_test//:WORKSPACE",
-        "@remote_java_tools_test_darwin_arm64//:WORKSPACE",
         "@remote_java_tools_test_darwin_x86_64//:WORKSPACE",
+        "@remote_java_tools_test_darwin_arm64//:WORKSPACE",
         "@remote_java_tools_test_linux//:WORKSPACE",
         "@remote_java_tools_test_windows//:WORKSPACE",
         "@remote_java_tools_windows_for_testing//:WORKSPACE",

src/main/cpp/BUILD

@@ -92,9 +92,9 @@ cc_binary(
     srcs = [
         "blaze.cc",
         "blaze.h",
-        "main.cc",
         "server_process_info.cc",
         "server_process_info.h",
+        "main.cc",
     ] + select({
         "//src/conditions:windows": ["resources.o"],
         "//conditions:default": [],

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

@@ -876,6 +876,7 @@ public void notifyCommandComplete(ExtendedEventHandler eventHandler) throws Inte
     memoizingEvaluator.noteEvaluationsAtSameVersionMayBeFinished(eventHandler);
     progressReceiver.globDeps = new ConcurrentHashMap<>();
     globFunction.complete();
+    clearSyscallCache();
   }
 
   /**
@@ -1349,7 +1350,6 @@ public void preparePackageLoading(
         starlarkSemantics.getBool(BuildLanguageOptions.EXPERIMENTAL_SIBLING_REPOSITORY_LAYOUT));
     setPackageLocator(pkgLocator);
 
-    clearSyscallCache();
     this.pkgFactory.setGlobbingThreads(executors.globbingParallelism());
     this.pkgFactory.setMaxDirectoriesToEagerlyVisitInGlobbing(
         packageOptions.maxDirectoriesToEagerlyVisitInGlobbing);

src/main/java/com/google/devtools/build/lib/vfs/DelegatingSyscallCache.java

@@ -14,16 +14,18 @@
 
 package com.google.devtools.build.lib.vfs;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.io.IOException;
 import java.util.Collection;
 import javax.annotation.Nullable;
 
 /** {@link SyscallCache} that delegates to an injectable one. */
 public class DelegatingSyscallCache implements SyscallCache {
-  private SyscallCache delegate;
+  private SyscallCache delegate = SyscallCache.NO_CACHE;
 
   public void setDelegate(SyscallCache syscallCache) {
-    this.delegate = syscallCache;
+    this.delegate = checkNotNull(syscallCache);
   }
 
   @Override

src/main/native/BUILD

@@ -24,8 +24,8 @@ filegroup(
     name = "jni_os",
     srcs = select({
         "//src/conditions:darwin": [
-            "darwin/file_jni.cc",
             "darwin/fsevents.cc",
+            "darwin/file_jni.cc",
             "darwin/sleep_prevention_jni.cc",
             "darwin/system_cpu_speed_monitor_jni.cc",
             "darwin/system_disk_space_monitor_jni.cc",

src/main/tools/BUILD

@@ -50,8 +50,8 @@ cc_binary(
     deps = select({
         "//src/conditions:windows": [],
         "//conditions:default": [
-            ":logging",
             ":process-tools",
+            ":logging",
         ],
     }),
 )

src/test/cpp/BUILD

@@ -15,8 +15,8 @@ cc_test(
             "blaze_util_windows_test.cc",
         ],
         "//conditions:default": [
-            "blaze_util_posix_test.cc",
             "blaze_util_test.cc",
+            "blaze_util_posix_test.cc",
         ],
     }),
     deps = [

src/test/java/com/google/devtools/build/android/BUILD

@@ -3,9 +3,9 @@ load("@rules_java//java:defs.bzl", "java_library", "java_test")
 filegroup(
     name = "srcs",
     srcs = glob(["**"]) + [
+        "//src/test/java/com/google/devtools/build/android/idlclass:srcs",
         "//src/test/java/com/google/devtools/build/android/desugar:srcs",
         "//src/test/java/com/google/devtools/build/android/dexer:srcs",
-        "//src/test/java/com/google/devtools/build/android/idlclass:srcs",
         "//src/test/java/com/google/devtools/build/android/junctions:srcs",
         "//src/test/java/com/google/devtools/build/android/r8:srcs",
         "//src/test/java/com/google/devtools/build/android/resources:srcs",

src/test/java/com/google/devtools/build/android/r8/BUILD

@@ -29,8 +29,8 @@ java_library(
         "//conditions:default": ["NoAndroidSdkStubTest.java"],
     }),
     deps = [
-        "//src/main/java/com/google/devtools/common/options:options_internal",
         "//src/test/java/com/google/devtools/build/lib/testutil:TestSuite",
+        "//src/main/java/com/google/devtools/common/options:options_internal",
         "//src/tools/android/java/com/google/devtools/build/android/r8",
         "//third_party:guava",
         "//third_party:junit4",

src/test/java/com/google/devtools/build/lib/BUILD

@@ -18,9 +18,9 @@ filegroup(
         "//src/test/java/com/google/devtools/build/lib/bazel:srcs",
         "//src/test/java/com/google/devtools/build/lib/bazel/google:srcs",
         "//src/test/java/com/google/devtools/build/lib/blackbox:srcs",
-        "//src/test/java/com/google/devtools/build/lib/bugreport:srcs",
         "//src/test/java/com/google/devtools/build/lib/buildeventservice:srcs",
         "//src/test/java/com/google/devtools/build/lib/buildeventstream:srcs",
+        "//src/test/java/com/google/devtools/build/lib/bugreport:srcs",
         "//src/test/java/com/google/devtools/build/lib/buildtool:srcs",
         "//src/test/java/com/google/devtools/build/lib/cmdline:srcs",
         "//src/test/java/com/google/devtools/build/lib/collect:srcs",
@@ -31,14 +31,14 @@ filegroup(
         "//src/test/java/com/google/devtools/build/lib/generatedprojecttest:srcs",
         "//src/test/java/com/google/devtools/build/lib/generatedprojecttest/util:srcs",
         "//src/test/java/com/google/devtools/build/lib/graph:srcs",
-        "//src/test/java/com/google/devtools/build/lib/integration/util:srcs",
         "//src/test/java/com/google/devtools/build/lib/io:srcs",
+        "//src/test/java/com/google/devtools/build/lib/integration/util:srcs",
         "//src/test/java/com/google/devtools/build/lib/metrics:srcs",
         "//src/test/java/com/google/devtools/build/lib/outputfilter:srcs",
         "//src/test/java/com/google/devtools/build/lib/packages:srcs",
+        "//src/test/java/com/google/devtools/build/lib/pkgcache:srcs",
         "//src/test/java/com/google/devtools/build/lib/packages/metrics:srcs",
         "//src/test/java/com/google/devtools/build/lib/packages/semantics:srcs",
-        "//src/test/java/com/google/devtools/build/lib/pkgcache:srcs",
         "//src/test/java/com/google/devtools/build/lib/platform:srcs",
         "//src/test/java/com/google/devtools/build/lib/platform/darwin:srcs",
         "//src/test/java/com/google/devtools/build/lib/profiler:srcs",
@@ -50,20 +50,20 @@ filegroup(
         "//src/test/java/com/google/devtools/build/lib/rules:srcs",
         "//src/test/java/com/google/devtools/build/lib/sandbox:srcs",
         "//src/test/java/com/google/devtools/build/lib/server:srcs",
-        "//src/test/java/com/google/devtools/build/lib/skyframe:srcs",
         "//src/test/java/com/google/devtools/build/lib/skyframe/packages:srcs",
         "//src/test/java/com/google/devtools/build/lib/skyframe/serialization:srcs",
+        "//src/test/java/com/google/devtools/build/lib/skyframe:srcs",
         "//src/test/java/com/google/devtools/build/lib/standalone:srcs",
         "//src/test/java/com/google/devtools/build/lib/starlark:srcs",
         "//src/test/java/com/google/devtools/build/lib/starlarkdebug/server:srcs",
         "//src/test/java/com/google/devtools/build/lib/supplier:srcs",
-        "//src/test/java/com/google/devtools/build/lib/testing/common:srcs",
-        "//src/test/java/com/google/devtools/build/lib/testutil:srcs",
+        "//src/test/java/com/google/devtools/build/lib/versioning:srcs",
+        "//src/test/java/com/google/devtools/build/lib/vfs:srcs",
         "//src/test/java/com/google/devtools/build/lib/unix:srcs",
         "//src/test/java/com/google/devtools/build/lib/unsafe:srcs",
         "//src/test/java/com/google/devtools/build/lib/util:srcs",
-        "//src/test/java/com/google/devtools/build/lib/versioning:srcs",
-        "//src/test/java/com/google/devtools/build/lib/vfs:srcs",
+        "//src/test/java/com/google/devtools/build/lib/testing/common:srcs",
+        "//src/test/java/com/google/devtools/build/lib/testutil:srcs",
         "//src/test/java/com/google/devtools/build/lib/view/cpp:srcs",
         "//src/test/java/com/google/devtools/build/lib/view/java:srcs",
         "//src/test/java/com/google/devtools/build/lib/view/util:srcs",

src/test/java/com/google/devtools/build/lib/blackbox/BUILD

@@ -39,10 +39,10 @@ filegroup(
     name = "srcs",
     testonly = 0,
     srcs = glob(["**"]) + [
-        "//src/test/java/com/google/devtools/build/lib/blackbox/bazel:srcs",
         "//src/test/java/com/google/devtools/build/lib/blackbox/framework:srcs",
-        "//src/test/java/com/google/devtools/build/lib/blackbox/junit:srcs",
+        "//src/test/java/com/google/devtools/build/lib/blackbox/bazel:srcs",
         "//src/test/java/com/google/devtools/build/lib/blackbox/tests:srcs",
+        "//src/test/java/com/google/devtools/build/lib/blackbox/junit:srcs",
     ],
     visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
 )

src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/BUILD

@@ -48,8 +48,8 @@ java_test(
     deps = common_deps + [
         "//src/main/java/com/google/devtools/build/lib/bazel/repository",
         "//src/main/java/com/google/devtools/build/lib/vfs",
-        "//src/test/java/com/google/devtools/build/lib/events:testutil",
         "//src/test/java/com/google/devtools/build/lib/vfs/util",
+        "//src/test/java/com/google/devtools/build/lib/events:testutil",
     ],
 )
 
@@ -66,8 +66,8 @@ java_test(
     deps = common_deps + [
         "//src/main/java/com/google/devtools/build/lib/bazel/repository",
         "//src/main/java/com/google/devtools/build/lib/vfs",
-        "//src/test/java/com/google/devtools/build/lib/events:testutil",
         "//src/test/java/com/google/devtools/build/lib/vfs/util",
+        "//src/test/java/com/google/devtools/build/lib/events:testutil",
     ],
 )
 
@@ -82,8 +82,8 @@ java_test(
     deps = common_deps + [
         "//src/main/java/com/google/devtools/build/lib/bazel/repository",
         "//src/main/java/com/google/devtools/build/lib/vfs",
-        "//src/test/java/com/google/devtools/build/lib/events:testutil",
         "//src/test/java/com/google/devtools/build/lib/vfs/util",
+        "//src/test/java/com/google/devtools/build/lib/events:testutil",
     ],
 )
 

src/test/java/com/google/devtools/build/lib/remote/BUILD

@@ -10,8 +10,8 @@ filegroup(
     testonly = 0,
     srcs = glob(["**"]) + [
         "//src/test/java/com/google/devtools/build/lib/remote/downloader:srcs",
-        "//src/test/java/com/google/devtools/build/lib/remote/grpc:srcs",
         "//src/test/java/com/google/devtools/build/lib/remote/http:srcs",
+        "//src/test/java/com/google/devtools/build/lib/remote/grpc:srcs",
         "//src/test/java/com/google/devtools/build/lib/remote/logging:srcs",
         "//src/test/java/com/google/devtools/build/lib/remote/merkletree:srcs",
         "//src/test/java/com/google/devtools/build/lib/remote/options:srcs",