Don't crash Bazel when a source directory crosses package boundaries

Also add the target for the test that was missed in the merge of ad381cb.

Work towards #25834

Closes #25863.

PiperOrigin-RevId: 758308509
Change-Id: Iafb5854c8986eb3f3b34d96e4f94990f6914f47a

Author: fmeum

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

@@ -334,16 +334,12 @@ private SkyValue createSourceValue(Artifact artifact, Environment env)
         case FILE_OPERATION_FAILURE:
         case SYMLINK_CYCLE_OR_INFINITE_EXPANSION:
         case CANNOT_TRAVERSE_SOURCE_DIRECTORY:
+        case CANNOT_CROSS_PACKAGE_BOUNDARY:
           throw new ArtifactFunctionException(
               SourceArtifactException.create(artifact, e), Transience.PERSISTENT);
         case INCONSISTENT_FILESYSTEM:
           throw new ArtifactFunctionException(
               SourceArtifactException.create(artifact, e), Transience.TRANSIENT);
-        case CANNOT_CROSS_PACKAGE_BOUNDARY:
-          throw new IllegalStateException(
-              String.format(
-                  "Cannot cross package boundary: %s %s %s", artifact, fileValue, request),
-              e);
         case GENERATED_PATH_CONFLICT:
           throw new IllegalStateException(
               String.format(

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

@@ -1904,6 +1904,24 @@ java_test(
     ],
 )
 
+java_test(
+    name = "SourceDirectoryIntegrationTest",
+    timeout = "short",
+    srcs = ["SourceDirectoryIntegrationTest.java"],
+    jvm_flags = [
+        "-DBAZEL_TRACK_SOURCE_DIRECTORIES=1",
+    ],
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/lib/events",
+        "//src/main/java/com/google/devtools/build/lib/vfs",
+        "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+        "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+        "//third_party:guava",
+        "//third_party:junit4",
+    ],
+)
+
 java_test(
     name = "FileArtifactValueTest",
     timeout = "short",

src/test/java/com/google/devtools/build/lib/skyframe/SourceDirectoryIntegrationTest.java

@@ -21,7 +21,6 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.BuildFailedException;
-import com.google.devtools.build.lib.bugreport.BugReport;
 import com.google.devtools.build.lib.buildtool.util.BuildIntegrationTestCase;
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.vfs.Path;
@@ -228,9 +227,7 @@ public void danglingSymlinkModified_invalidatesAction() throws Exception {
   @Test
   public void crossingPackageBoundary_fails() throws Exception {
     createEmptyFile(sourceDir.getRelative("subdir/BUILD"));
-    // TODO(#25834): This should not crash Bazel.
-    assertThrows(IllegalStateException.class, () -> buildTarget("//foo"));
-    BugReport.getAndResetLastCrashingThrowableIfInTest();
+    assertThrows(BuildFailedException.class, () -> buildTarget("//foo"));
     assertContainsEvent(
         "Directory artifact foo/dir crosses package boundary into package rooted at"
             + " foo/dir/subdir");