Bytecode DSL tracing fix: pop tracing data even if trace function raises

- Ensures that instrumentation data is always popped from the thread state,
  even if the trace or profile function raises an exception.
- Improves assertion in popInstrumentationData for more informative errors.

Author: steve-s

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

@@ -487,8 +487,11 @@ public static void doExit(VirtualFrame frame, AbstractTruffleException ate,
             }
 
             if (root.needsTraceAndProfileInstrumentation()) {
-                root.traceOrProfileReturn(frame, location, null);
-                root.getThreadState().popInstrumentationData(root);
+                try {
+                    root.traceOrProfileReturn(frame, location, null);
+                } finally {
+                    root.getThreadState().popInstrumentationData(root);
+                }
             }
 
             root.calleeContext.exit(frame, root, location);
@@ -1055,11 +1058,13 @@ public static Object doYield(
                         @Bind ContinuationRootNode continuationRootNode,
                         @Bind PBytecodeDSLRootNode innerRoot,
                         @Bind BytecodeNode bytecodeNode) {
-            Object result = createGenerator(continuationFrame, inliningTarget, continuationRootNode, innerRoot);
-            if (innerRoot.needsTraceAndProfileInstrumentation()) {
-                innerRoot.getThreadState().popInstrumentationData(innerRoot);
+            try {
+                return createGenerator(continuationFrame, inliningTarget, continuationRootNode, innerRoot);
+            } finally {
+                if (innerRoot.needsTraceAndProfileInstrumentation()) {
+                    innerRoot.getThreadState().popInstrumentationData(innerRoot);
+                }
             }
-            return result;
         }
 
         private static PythonAbstractObject createGenerator(MaterializedFrame continuationFrame, Node inliningTarget,
@@ -1115,8 +1120,11 @@ public static Object doObject(Object value,
                         @Bind PBytecodeDSLRootNode root,
                         @Bind BytecodeNode bytecode) {
             if (root.needsTraceAndProfileInstrumentation()) {
-                root.traceOrProfileReturn(frame, bytecode, value);
-                root.getThreadState().popInstrumentationData(root);
+                try {
+                    root.traceOrProfileReturn(frame, bytecode, value);
+                } finally {
+                    root.getThreadState().popInstrumentationData(root);
+                }
             }
 
             // Suspended generators have no backref

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

@@ -613,8 +613,8 @@ public void pushInstrumentationData(PBytecodeDSLRootNode rootNode) {
 
         public void popInstrumentationData(PBytecodeDSLRootNode rootNode) {
             assert PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER;
-            assert instrumentationData != null;
-            assert instrumentationData.getRootNode() == rootNode : instrumentationData.getRootNode();
+            assert instrumentationData != null : rootNode;
+            assert instrumentationData.getRootNode() == rootNode : String.format("%s != %s", instrumentationData.getRootNode(), rootNode);
             instrumentationData = instrumentationData.getPrevious();
         }