Don't handle exceptions twice in OSR

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/OSRException.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.nodes.bytecode;
+
+import com.oracle.graal.python.runtime.exception.PythonControlFlowException;
+import com.oracle.truffle.api.exception.AbstractTruffleException;
+
+/*
+Container for for propagating exceptions from OSR without handling them twice.
+ */
+public class OSRException extends PythonControlFlowException {
+    private static final long serialVersionUID = 425126860491305807L;
+    public final AbstractTruffleException exception;
+
+    public OSRException(AbstractTruffleException exception) {
+        this.exception = exception;
+    }
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -1769,7 +1769,19 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                                  * variables) or it will get mixed up. To retain such state, put it
                                  * into the frame instead.
                                  */
-                                Object osrResult = BytecodeOSRNode.tryOSR(osrNode, bci, new OSRInterpreterState(stackTop), null, virtualFrame);
+                                Object osrResult;
+                                try {
+                                    osrResult = BytecodeOSRNode.tryOSR(osrNode, bci, new OSRInterpreterState(stackTop), null, virtualFrame);
+                                } catch (AbstractTruffleException e) {
+                                    /*
+                                     * If the OSR execution throws a python exception, it means it
+                                     * has already been processed by the bytecode exception handler
+                                     * therein. We wrap it in order to make sure it doesn't get
+                                     * processed again, which would overwrite the traceback entry
+                                     * with the location of this jump instruction.
+                                     */
+                                    throw new OSRException(e);
+                                }
                                 if (osrResult != null) {
                                     if (CompilerDirectives.hasNextTier() && mutableData.loopCount > 0) {
                                         LoopNode.reportLoopCount(this, mutableData.loopCount);
@@ -2039,6 +2051,9 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                 bci++;
             } catch (PythonExitException | PythonThreadKillException e) {
                 throw e;
+            } catch (OSRException e) {
+                // Exception from OSR was already handled in the OSR code
+                throw e.exception;
             } catch (Exception | StackOverflowError | AssertionError e) {
                 PException pe = null;
                 boolean isInteropException = false;