Fix traceback handling in yield from

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/traceback/GetTracebackNode.java

@@ -101,8 +101,9 @@
  * <li>When you catch a {@link PException PException} and need to obtain its corresponding
  * {@link com.oracle.graal.python.builtins.objects.exception.PBaseException PBaseException}, use the
  * {@link PException#setCatchingFrameAndGetEscapedException(VirtualFrame, Node)} method, unless
- * you're just doing a simple class check. Try to avoid the {@link PException#getUnreifiedException()
- * getExceptionObject} method unless you know what you're doing.</li>
+ * you're just doing a simple class check. Try to avoid the
+ * {@link PException#getUnreifiedException() getExceptionObject} method unless you know what you're
+ * doing.</li>
  * <li>{@link PException PException} must never be rethrown after it has been possibly exposed to
  * the program, because its Truffle stacktrace may already be frozen and it would not capture more
  * frames. If you need to rethrow without the catching site appearing in the traceback, use

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/YieldFromNode.java

@@ -42,11 +42,9 @@
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.generator.ThrowData;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
-import com.oracle.graal.python.builtins.objects.traceback.GetTracebackNode;
 import com.oracle.graal.python.nodes.WriteUnraisableNode;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
 import com.oracle.graal.python.nodes.call.CallNode;
@@ -76,7 +74,6 @@ public class YieldFromNode extends AbstractYieldNode implements GeneratorControl
     @Child private GetAttributeNode getSendNode;
     @Child private CallNode callSendNode;
 
-    @Child private GetTracebackNode getTracebackNode;
     @Child private WriteUnraisableNode writeUnraisableNode;
 
     @Child private IsBuiltinClassProfile stopIterProfile1 = IsBuiltinClassProfile.create();
@@ -176,12 +173,7 @@ public Object execute(VirtualFrame frame) {
                         throw PException.fromObject(_e.pythonException, this, _e.withJavaStacktrace);
                     }
                     try {
-                        PBaseException pythonException = _e.pythonException;
-                        Object excTraceback = ensureGetTracebackNode().execute(pythonException.getTraceback());
-                        if (excTraceback == null) {
-                            excTraceback = PNone.NONE;
-                        }
-                        _y = getCallThrowNode().execute(frame, _m, pythonException, PNone.NONE, excTraceback);
+                        _y = getCallThrowNode().execute(frame, _m, _e.pythonException);
                     } catch (PException _e2) {
                         access.setIterator(frame, iteratorSlot, null);
                         _e2.expectStopIteration(stopIterProfile2);
@@ -276,14 +268,6 @@ private CallNode getCallSendNode() {
         return callSendNode;
     }
 
-    private GetTracebackNode ensureGetTracebackNode() {
-        if (getTracebackNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            getTracebackNode = insert(GetTracebackNode.create());
-        }
-        return getTracebackNode;
-    }
-
     private WriteUnraisableNode ensureWriteUnraisable() {
         if (writeUnraisableNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();