Improve assertion messages

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java

@@ -152,7 +152,8 @@ public final PFrame executeOnStack(boolean markAsEscaped, boolean forceSync, Fra
      */
     public final PFrame execute(Node location, boolean markAsEscaped, boolean forceSync, Frame frameToMaterialize) {
         assert !PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER || frameToMaterialize.getArguments().length != 2 : "caller forgot to unwrap continuation frame";
-        assert !PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER || !(location instanceof PBytecodeDSLRootNode) : location.getClass().getSimpleName();
+        assert !PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER || !(location instanceof PBytecodeDSLRootNode) : String.format("Materialized frame: location must not be PBytecodeDSLRootNode, was: %s",
+                        location);
         return executeImpl(location, markAsEscaped, forceSync, frameToMaterialize);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/AsyncHandler.java

@@ -61,6 +61,7 @@
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.graal.python.nodes.PRootNode;
+import com.oracle.graal.python.nodes.bytecode_dsl.PBytecodeDSLRootNode;
 import com.oracle.graal.python.nodes.call.CallDispatchers;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.frame.ReadCallerFrameNode;
@@ -170,6 +171,8 @@ public final void execute(PythonContext context, Access access) {
                         // IndirectCalleeContext.enter and transfer the state from thread state to
                         // the frame. If we were woken-up in middle of Python frame code, we will
                         // have to do a stack walk, but we still need the location
+                        assert !PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER ||
+                                        !(location instanceof PBytecodeDSLRootNode) : String.format("Async action: location must not be PBytecodeDSLRootNode, was: %s", location);
                         prev = EncapsulatingNodeReference.getCurrent().set(location);
                     }
                     try {