[8.1.0] Implement debugPrint for built-in file providers (#25161)

Simplifies `print` style debugging. Closes #24156. PiperOrigin-RevId: 721850583 Change-Id: I8b3c3a1063f1dbfa3c0c1556e1112c1885a5c6a9 Commit fe7b4ab Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>
bazelbuild · Feb 3, 2025 · 09cebfc · 09cebfc
1 parent 549e13e
commit 09cebfc
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -795,6 +795,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/concurrent",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
+        "//src/main/java/net/starlark/java/eval",
     ],
 )
 

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java
@@ -21,6 +21,8 @@
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.starlarkbuildapi.FileProviderApi;
+import net.starlark.java.eval.Printer;
+import net.starlark.java.eval.StarlarkThread;
 
 /**
  * A representation of the concept "this transitive info provider builds these files".
@@ -53,6 +55,13 @@ public boolean isImmutable() {
     return Depset.of(Artifact.class, filesToBuild);
   }
 
+  @Override
+  public void debugPrint(Printer printer, StarlarkThread thread) {
+    printer.append("FileProvider(files_to_build = ");
+    printer.debugPrint(getFilesToBuildForStarlark(), thread);
+    printer.append(")");
+  }
+
   public NestedSet<Artifact> getFilesToBuild() {
     return filesToBuild;
   }

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
@@ -23,6 +23,8 @@
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.starlarkbuildapi.FilesToRunProviderApi;
 import javax.annotation.Nullable;
+import net.starlark.java.eval.Printer;
+import net.starlark.java.eval.StarlarkThread;
 
 /** Returns information about executables produced by a target and the files needed to run it. */
 @Immutable
@@ -106,6 +108,17 @@ public Artifact getRepoMappingManifest() {
     return runfilesSupport != null ? runfilesSupport.getRepoMappingManifest() : null;
   }
 
+  @Override
+  public void debugPrint(Printer printer, StarlarkThread thread) {
+    printer.append("FilesToRunProvider(executable = ");
+    printer.debugPrint(getExecutable(), thread);
+    printer.append(", repo_mapping_manifest = ");
+    printer.debugPrint(getRepoMappingManifest(), thread);
+    printer.append(", runfiles_manifest = ");
+    printer.debugPrint(getRunfilesManifest(), thread);
+    printer.append(")");
+  }
+
   /** A single executable. */
   private static final class SingleExecutableFilesToRunProvider extends FilesToRunProvider {
 

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
@@ -55,6 +55,7 @@
 import java.util.UUID;
 import javax.annotation.Nullable;
 import net.starlark.java.eval.EvalException;
+import net.starlark.java.eval.Printer;
 import net.starlark.java.eval.Sequence;
 import net.starlark.java.eval.Starlark;
 import net.starlark.java.eval.StarlarkSemantics;
@@ -1104,4 +1105,17 @@ String describeFingerprint(boolean digestAbsolutePaths) {
                 artifacts))
         + String.format("emptyFilesSupplier: %s\n", emptyFilesSupplier.getClass().getName());
   }
+
+  @Override
+  public void debugPrint(Printer printer, StarlarkThread thread) {
+    printer.append("Runfiles(empty_files = ");
+    printer.debugPrint(getEmptyFilenamesForStarlark(), thread);
+    printer.append(", files = ");
+    printer.debugPrint(getArtifactsForStarlark(), thread);
+    printer.append(", root_symlinks = ");
+    printer.debugPrint(getRootSymlinksForStarlark(), thread);
+    printer.append(", symlinks = ");
+    printer.debugPrint(getSymlinksForStarlark(), thread);
+    printer.append(")");
+  }
 }