Improve __graalpython__.dis for Bytecode DSL

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -688,14 +688,14 @@ public String toString() {
     public String toDisassembledString(boolean quickened) {
         RootNode rootNode = getRootCallTarget().getRootNode();
         if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER && rootNode instanceof PBytecodeDSLRootNode dslRoot) {
-            return dslRoot.getCodeUnit().toString(quickened);
+            return dslRoot.getCodeUnit().toString(quickened, dslRoot);
         } else if (rootNode instanceof PBytecodeGeneratorRootNode r) {
             rootNode = r.getBytecodeRootNode();
         } else if (rootNode instanceof PBytecodeGeneratorFunctionRootNode r) {
             rootNode = r.getBytecodeRootNode();
         }
         if (rootNode instanceof PBytecodeRootNode bytecodeRootNode) {
-            return bytecodeRootNode.getCodeUnit().toString(quickened);
+            return bytecodeRootNode.getCodeUnit().toString(quickened, bytecodeRootNode);
         }
         return J_EMPTY_STRING;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/BytecodeCodeUnit.java

@@ -59,6 +59,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.strings.TruffleString;
 
 public final class BytecodeCodeUnit extends CodeUnit {
@@ -149,7 +150,7 @@ public void generalizeInputs(int bci) {
     }
 
     @Override
-    protected void dumpBytecode(StringBuilder sb, boolean quickened) {
+    protected void dumpBytecode(StringBuilder sb, boolean quickened, RootNode rootNode) {
         int bci = 0;
         int oparg = 0;
         SourceMap map = getSourceMap();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/CodeUnit.java

@@ -47,6 +47,7 @@
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -180,16 +181,18 @@ public final Signature computeSignature() {
 
     @Override
     public String toString() {
-        return toString(false);
+        return toString(false, null);
     }
 
-    protected abstract void dumpBytecode(StringBuilder sb, boolean optimized);
+    protected abstract void dumpBytecode(StringBuilder sb, boolean optimized, RootNode rootNode);
 
     /**
      * @param optimized Whether to print the initial state of the bytecode or current state, if
      *            available, where some instructions may be transformed, e.g., quickened.
+     * @param rootNode The root node if available (Bytecode DSL code unit may contain just
+     *            serialized code).
      */
-    public String toString(boolean optimized) {
+    public String toString(boolean optimized, RootNode rootNode) {
         StringBuilder sb = new StringBuilder();
 
         sb.append("Disassembly of ").append(qualname).append(":\n");
@@ -208,12 +211,12 @@ public String toString(boolean optimized) {
             sb.append("Flags: ").append(String.join(" | ", flagNames)).append("\n");
         }
 
-        dumpBytecode(sb, optimized);
+        dumpBytecode(sb, optimized, rootNode);
 
         for (Object c : constants) {
             if (c instanceof CodeUnit cd) {
                 sb.append('\n');
-                sb.append(cd.toString(optimized));
+                sb.append(cd.toString(optimized, null));
             }
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/BytecodeDSLCodeUnit.java

@@ -53,6 +53,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.bytecode.BytecodeRootNodes;
 import com.oracle.truffle.api.bytecode.serialization.BytecodeSerializer;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.strings.TruffleString;
 
@@ -130,13 +131,21 @@ public TruffleString getDocstring() {
     }
 
     @Override
-    protected void dumpBytecode(StringBuilder sb, boolean optimized) {
-        for (int i = 0; i < nodes.count(); i++) {
-            if (i != 0) {
+    protected void dumpBytecode(StringBuilder sb, boolean optimized, RootNode rootNode) {
+        if (nodes == null) {
+            if (rootNode instanceof PBytecodeDSLRootNode dslRoot) {
+                sb.append(dslRoot.dump());
                 sb.append('\n');
             }
-            sb.append(nodes.getNode(i).dump());
-            sb.append('\n'); // dump does not print newline at the end
+            sb.append("bytecode not available\n");
+        } else {
+            for (int i = 0; i < nodes.count(); i++) {
+                if (i != 0) {
+                    sb.append('\n');
+                }
+                sb.append(nodes.getNode(i).dump());
+                sb.append('\n'); // dump does not print newline at the end
+            }
         }
     }
 }