Revert the workaround for Bytecode DSL assertion that exception location belongs to the throwing root

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java

@@ -287,7 +287,7 @@ public LazyTraceback internalReifyException(PFrame.Reference curFrameInfo) {
      **/
     public PException getExceptionForReraise(LazyTraceback reraiseTraceback) {
         setTraceback(reraiseTraceback);
-        return PException.fromObject(this, null, exception.getLocation(), false);
+        return PException.fromObject(this, exception.getLocation(), false);
     }
 
     @ExportMessage

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java

@@ -103,64 +103,39 @@ public final class PException extends AbstractTruffleException {
     private boolean skipFirstTracebackFrame;
     private int tracebackFrameCount;
 
-    /**
-     * We create new {@link PException} instances wrapping the same {@link PBaseException} as the
-     * stack is unwound when the exception is reraised. See {@link MaterializeLazyTracebackNode} for
-     * more details.
-     * <p>
-     * Since the new {@link PException} for reraise will be thrown from different frame than the
-     * initial {@link PException}, Truffle will think that it belongs to that frame and not to the
-     * original frame. Truffle expects the {@link AbstractTruffleException#getLocation()} to belong
-     * the (AST of the root node of) frame where the exception was thrown. If we just copy the
-     * location from the initial {@link PException} to the {@link PException} constructed for
-     * reraise, the location would not satisfy that property, but at the same time we like to keep
-     * the original location to use it in {@link InteropLibrary#getSourceLocation} message.
-     */
-    private final Node originalLocation;
-
     private PException(Object pythonException, Node node) {
         super(node);
         this.pythonException = pythonException;
-        this.originalLocation = node;
     }
 
-    private PException(Object pythonException, Node location, Node originalLocation, Throwable wrapped) {
-        super(null, wrapped, UNLIMITED_STACK_TRACE, location);
+    private PException(Object pythonException, Node node, Throwable wrapped) {
+        super(null, wrapped, UNLIMITED_STACK_TRACE, node);
         this.pythonException = pythonException;
-        this.originalLocation = originalLocation;
         assert PyExceptionInstanceCheckNode.executeUncached(pythonException);
     }
 
-    public static PException fromObject(Object pythonException, Node location, boolean withJavaStacktrace) {
-        return fromObject(pythonException, location, location, withJavaStacktrace);
-    }
-
-    public static PException fromObject(Object pythonException, Node location, Node originalLocation, boolean withJavaStacktrace) {
+    public static PException fromObject(Object pythonException, Node node, boolean withJavaStacktrace) {
         Throwable wrapped = null;
         if (withJavaStacktrace) {
             // Create a carrier for the java stacktrace as PException cannot have one
             wrapped = createStacktraceCarrier();
         }
-        return fromObject(pythonException, location, originalLocation, wrapped);
+        return fromObject(pythonException, node, wrapped);
     }
 
     @TruffleBoundary
     private static RuntimeException createStacktraceCarrier() {
         return new RuntimeException();
     }
 
-    public static PException fromObject(Object pythonException, Node location, Throwable wrapped) {
-        return fromObject(pythonException, location, location, wrapped);
-    }
-
     /*
      * Note: we use this method to convert a Java StackOverflowError into a Python RecursionError.
      * At the time when this is done, some Java stack frames were already unwinded but there is no
      * guarantee on how many. Therefore, it is important that this method is simple. In particular,
      * do not add calls if that can be avoided.
      */
-    public static PException fromObject(Object pythonException, Node node, Node originalLocation, Throwable wrapped) {
-        PException pException = new PException(pythonException, node, originalLocation, wrapped);
+    public static PException fromObject(Object pythonException, Node node, Throwable wrapped) {
+        PException pException = new PException(pythonException, node, wrapped);
         if (pythonException instanceof PBaseException managedException) {
             managedException.setException(pException);
         }
@@ -173,7 +148,7 @@ public static PException fromExceptionInfo(Object pythonException, boolean withJ
             // Create a carrier for the java stacktrace as PException cannot have one
             wrapped = createStacktraceCarrier();
         }
-        PException pException = new PException(pythonException, null, null, wrapped);
+        PException pException = new PException(pythonException, null, wrapped);
         pException.reified = true;
         if (pythonException instanceof PBaseException managedException) {
             managedException.setException(pException);
@@ -423,7 +398,7 @@ public void notifyAddedTracebackFrame(boolean visible) {
      */
     public PException getExceptionForReraise(boolean rootNodeVisible) {
         ensureReified();
-        PException pe = PException.fromObject(pythonException, null, getLocation(), false);
+        PException pe = PException.fromObject(pythonException, getLocation(), false);
         if (rootNodeVisible) {
             pe.skipFirstTracebackFrame();
         }
@@ -467,15 +442,15 @@ RuntimeException throwException(@Exclusive @Cached GilNode gil) {
     @ExportMessage
     @SuppressWarnings("static-method")
     boolean hasSourceLocation() {
-        return originalLocation != null && originalLocation.getEncapsulatingSourceSection() != null;
+        return getLocation() != null && getLocation().getEncapsulatingSourceSection() != null;
     }
 
     @ExportMessage(name = "getSourceLocation")
     SourceSection getExceptionSourceLocation(
                     @Bind("$node") Node inliningTarget,
                     @Cached InlinedBranchProfile unsupportedProfile) throws UnsupportedMessageException {
         if (hasSourceLocation()) {
-            return originalLocation.getEncapsulatingSourceSection();
+            return getLocation().getEncapsulatingSourceSection();
         }
         unsupportedProfile.enter(inliningTarget);
         throw UnsupportedMessageException.create();