[GR-70898] Pass location to boundary code that raises errors.

steve-s · steve-s · commit 669bf0924126 · 2025-10-20T10:01:47.000Z
PullRequest: graalpython/4063
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java
@@ -165,7 +165,7 @@ private static PythonClass initClass(TruffleString className, TruffleString supe
     }
 
     private static PythonClass initClass(TruffleString className, PythonAbstractClass superClass, BuiltinDescr[] descrs, PythonModule codecsTruffleModule, PythonLanguage language) {
-        PythonClass clazz = PFactory.createPythonClassAndFixupSlots(language, className, superClass, new PythonAbstractClass[]{superClass});
+        PythonClass clazz = PFactory.createPythonClassAndFixupSlots(null, language, className, superClass, new PythonAbstractClass[]{superClass});
         for (BuiltinDescr d : descrs) {
             PythonUtils.createMethod(language, clazz, d.nodeFactory(), d.enclosingType ? clazz : null, 1);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ast/AstTypeFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ast/AstTypeFactory.java
@@ -71,7 +71,7 @@ final class AstTypeFactory {
     }
 
     PythonClass makeType(TruffleString name, PythonAbstractClass base, TruffleString[] fields, TruffleString[] attributes, TruffleString[] optional, TruffleString docString) {
-        PythonClass newType = PFactory.createPythonClassAndFixupSlots(language, name, base, new PythonAbstractClass[]{base});
+        PythonClass newType = PFactory.createPythonClassAndFixupSlots(null, language, name, base, new PythonAbstractClass[]{base});
         newType.setAttribute(T___MODULE__, T_AST);
         newType.setAttribute(T___DOC__, docString);
         newType.setAttribute(T__FIELDS, PFactory.createTuple(language, convertToObjectArray(fields)));
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java
@@ -688,14 +688,14 @@ public String toString() {
     public String toDisassembledString(boolean quickened) {
         RootNode rootNode = getRootCallTarget().getRootNode();
         if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER && rootNode instanceof PBytecodeDSLRootNode dslRoot) {
-            return dslRoot.getCodeUnit().toString(quickened);
+            return dslRoot.getCodeUnit().toString(quickened, dslRoot);
         } else if (rootNode instanceof PBytecodeGeneratorRootNode r) {
             rootNode = r.getBytecodeRootNode();
         } else if (rootNode instanceof PBytecodeGeneratorFunctionRootNode r) {
             rootNode = r.getBytecodeRootNode();
         }
         if (rootNode instanceof PBytecodeRootNode bytecodeRootNode) {
-            return bytecodeRootNode.getCodeUnit().toString(quickened);
+            return bytecodeRootNode.getCodeUnit().toString(quickened, bytecodeRootNode);
         }
         return J_EMPTY_STRING;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/SSLOperationNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/SSLOperationNode.java
@@ -120,12 +120,12 @@ public void read(VirtualFrame frame, Node inliningTarget, PSSLSocket socket, Byt
      * Errors are wrapped into Python exceptions. Requests for IO in non-blocking modes are
      * indicated using Python exceptions ({@code SSLErrorWantRead}, {@code SSLErrorWantWrite}).
      */
-    public void handshake(VirtualFrame frame, Node inliningTarget, PSSLSocket socket) {
+    public void handshake(VirtualFrame frame, Node inliningTarget, PConstructAndRaiseNode.Lazy constructAndRaiseNode, PSSLSocket socket) {
         if (!socket.isHandshakeComplete()) {
             try {
                 beginHandshake(socket);
             } catch (SSLException e) {
-                throw handleSSLException(e);
+                throw handleSSLException(inliningTarget, e, constructAndRaiseNode);
             }
             execute(frame, inliningTarget, socket, SSLOperationNode.EMPTY_BUFFER, SSLOperationNode.EMPTY_BUFFER, SSLOperation.HANDSHAKE);
         }
@@ -268,7 +268,7 @@ static void doSocket(VirtualFrame frame, Node inliningTarget, PSSLSocket socket,
                         break;
                 }
             } catch (SSLException e) {
-                throw handleSSLException(e);
+                throw handleSSLException(inliningTarget, e, constructAndRaiseNode);
             } catch (OverflowException | OutOfMemoryError node) {
                 throw raiseNode.raise(inliningTarget, MemoryError);
             }
@@ -310,7 +310,7 @@ static void doMemory(VirtualFrame frame, Node inliningTarget, PSSLSocket socket,
                     throw CompilerDirectives.shouldNotReachHere("MemoryBIO-based socket operation returned WANTS_WRITE");
             }
         } catch (SSLException e) {
-            throw handleSSLException(e);
+            throw handleSSLException(inliningTarget, e, constructAndRaiseNode);
         } catch (OverflowException | OutOfMemoryError node) {
             throw raiseNode.raise(inliningTarget, MemoryError);
         }
@@ -550,10 +550,10 @@ private static SSLEngineResult doWrap(SSLEngine engine, ByteBuffer appInput, PMe
     }
 
     @TruffleBoundary
-    private static PException handleSSLException(SSLException e) {
+    private static PException handleSSLException(Node inliningTarget, SSLException e, PConstructAndRaiseNode.Lazy raiseNode) {
         if (e.getCause() instanceof CertificateException) {
-            throw PConstructAndRaiseNode.raiseUncachedSSLError(SSLErrorCode.ERROR_CERT_VERIFICATION, ErrorMessages.CERTIFICATE_VERIFY_FAILED, e.toString());
+            throw raiseNode.get(inliningTarget).raiseSSLError(null, SSLErrorCode.ERROR_CERT_VERIFICATION, ErrorMessages.CERTIFICATE_VERIFY_FAILED, e.toString());
         }
-        throw PConstructAndRaiseNode.raiseUncachedSSLError(SSLErrorCode.ERROR_SSL, toTruffleStringUncached(e.toString()));
+        throw raiseNode.get(inliningTarget).raiseSSLError(null, SSLErrorCode.ERROR_SSL, toTruffleStringUncached(e.toString()));
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/SSLSocketBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/SSLSocketBuiltins.java
@@ -68,6 +68,7 @@
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAcquireLibrary;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PConstructAndRaiseNode;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
@@ -196,8 +197,9 @@ abstract static class DoHandshakeNode extends PythonUnaryBuiltinNode {
         @Specialization
         Object doHandshake(VirtualFrame frame, PSSLSocket self,
                         @Bind Node inliningTarget,
+                        @Cached PConstructAndRaiseNode.Lazy constructAndRaiseNode,
                         @Cached SSLOperationNode sslOperationNode) {
-            sslOperationNode.handshake(frame, inliningTarget, self);
+            sslOperationNode.handshake(frame, inliningTarget, constructAndRaiseNode, self);
             return PNone.NONE;
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java
@@ -67,7 +67,7 @@ public final class PythonBuiltinClass extends PythonManagedClass {
 
     @TruffleBoundary
     public PythonBuiltinClass(PythonLanguage lang, PythonBuiltinClassType builtinClass, PythonAbstractClass base) {
-        super(lang, builtinClass.getType(), builtinClass.getType().getInstanceShape(lang), builtinClass.getInstanceShape(lang), builtinClass.getName(), base, new PythonAbstractClass[]{base},
+        super(null, lang, builtinClass.getType(), builtinClass.getType().getInstanceShape(lang), builtinClass.getInstanceShape(lang), builtinClass.getName(), base, new PythonAbstractClass[]{base},
                         builtinClass.getSlots());
         this.type = builtinClass;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java
@@ -28,7 +28,6 @@
 import java.lang.ref.WeakReference;
 import java.util.ArrayDeque;
 import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicReference;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
@@ -41,9 +40,7 @@
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.graal.python.util.SuppressFBWarnings;
-import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -69,7 +66,6 @@ public final class PythonClass extends PythonManagedClass {
     private static final int MRO_SUBTYPES_MAX = 64;
     private static final int MRO_SHAPE_INVALIDATIONS_MAX = 5;
 
-    private final AtomicReference<Assumption> slotsFinalAssumption = new AtomicReference<>();
     private MroShape mroShape;  // only set if there's no inheritance from native types
     /**
      * Array of all classes that contain this class in their MRO and that have non-null mroShape,
@@ -80,30 +76,12 @@ public final class PythonClass extends PythonManagedClass {
     private TruffleWeakReference<PythonClass>[] mroShapeSubTypes;
     private byte mroShapeInvalidationsCount;
 
-    public PythonClass(PythonLanguage lang, Object typeClass, Shape classShape, TruffleString name, Object base, PythonAbstractClass[] baseClasses) {
-        super(lang, typeClass, classShape, null, name, base, baseClasses, null);
+    public PythonClass(Node location, PythonLanguage lang, Object typeClass, Shape classShape, TruffleString name, Object base, PythonAbstractClass[] baseClasses) {
+        super(location, lang, typeClass, classShape, null, name, base, baseClasses, null);
     }
 
-    public PythonClass(PythonLanguage lang, Object typeClass, Shape classShape, TruffleString name, boolean invokeMro, Object base, PythonAbstractClass[] baseClasses) {
-        super(lang, typeClass, classShape, null, name, invokeMro, false, base, baseClasses, null);
-    }
-
-    public Assumption getSlotsFinalAssumption() {
-        Assumption result = slotsFinalAssumption.get();
-        if (result == null) {
-            result = Truffle.getRuntime().createAssumption("slots");
-            if (!slotsFinalAssumption.compareAndSet(null, result)) {
-                result = slotsFinalAssumption.get();
-            }
-        }
-        return result;
-    }
-
-    public void invalidateSlotsFinalAssumption() {
-        Assumption assumption = slotsFinalAssumption.get();
-        if (assumption != null) {
-            assumption.invalidate();
-        }
+    public PythonClass(Node location, PythonLanguage lang, Object typeClass, Shape classShape, TruffleString name, boolean invokeMro, Object base, PythonAbstractClass[] baseClasses) {
+        super(location, lang, typeClass, classShape, null, name, invokeMro, false, base, baseClasses, null);
     }
 
     public void setTpSlots(TpSlots tpSlots) {
@@ -114,10 +92,6 @@ public void setTpSlots(TpSlots tpSlots) {
     @TruffleBoundary
     @SuppressFBWarnings(value = "UR_UNINIT_READ_CALLED_FROM_SUPER_CONSTRUCTOR")
     public void setAttribute(TruffleString key, Object value) {
-        if (slotsFinalAssumption != null) {
-            // It is OK when slotsFinalAssumption is null during the super ctor call
-            invalidateSlotsFinalAssumption();
-        }
         super.setAttribute(key, value);
         invalidateMroShapeSubTypes();
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java
@@ -79,13 +79,14 @@ public abstract class PythonManagedClass extends PythonObject implements PythonA
     public PTuple basesTuple;
 
     @TruffleBoundary
-    protected PythonManagedClass(PythonLanguage lang, Object typeClass, Shape classShape, Shape instanceShape, TruffleString name, Object base, PythonAbstractClass[] baseClasses, TpSlots slots) {
-        this(lang, typeClass, classShape, instanceShape, name, true, true, base, baseClasses, slots);
+    protected PythonManagedClass(Node location, PythonLanguage lang, Object typeClass, Shape classShape, Shape instanceShape, TruffleString name, Object base, PythonAbstractClass[] baseClasses,
+                    TpSlots slots) {
+        this(location, lang, typeClass, classShape, instanceShape, name, true, true, base, baseClasses, slots);
     }
 
     @TruffleBoundary
     @SuppressWarnings("this-escape")
-    protected PythonManagedClass(PythonLanguage lang, Object typeClass, Shape classShape, Shape instanceShape, TruffleString name, boolean invokeMro, boolean initDocAttr,
+    protected PythonManagedClass(Node location, PythonLanguage lang, Object typeClass, Shape classShape, Shape instanceShape, TruffleString name, boolean invokeMro, boolean initDocAttr,
                     Object base, PythonAbstractClass[] baseClasses, TpSlots slots) {
         super(typeClass, classShape);
         this.name = name;
@@ -101,8 +102,7 @@ protected PythonManagedClass(PythonLanguage lang, Object typeClass, Shape classS
             unsafeSetSuperClass(baseClasses);
         }
 
-        // TODO should pass node for exception location
-        this.setMRO(ComputeMroNode.doSlowPath(null, this, invokeMro));
+        this.setMRO(ComputeMroNode.doSlowPath(location, this, invokeMro));
         if (invokeMro) {
             mroInitialized = true;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java
@@ -2172,7 +2172,7 @@ static PythonClass typeMetaclass(VirtualFrame frame, TruffleString name, PTuple
 
             // 1.) create class, but avoid calling mro method - it might try to access __dict__ so
             // we have to copy dict slots first
-            PythonClass pythonClass = PFactory.createPythonClass(language, metaclass, getInstanceShape.execute(metaclass), name, false, base, basesArray);
+            PythonClass pythonClass = PFactory.createPythonClass(inliningTarget, language, metaclass, getInstanceShape.execute(metaclass), name, false, base, basesArray);
 
             // 2.) copy the dictionary slots
             copyDictSlots(frame, inliningTarget, language, ctx, pythonClass, namespace, setHashingStorageItem,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/BytecodeCodeUnit.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/BytecodeCodeUnit.java
@@ -59,6 +59,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.strings.TruffleString;
 
 public final class BytecodeCodeUnit extends CodeUnit {
@@ -149,7 +150,7 @@ public void generalizeInputs(int bci) {
     }
 
     @Override
-    protected void dumpBytecode(StringBuilder sb, boolean quickened) {
+    protected void dumpBytecode(StringBuilder sb, boolean quickened, RootNode rootNode) {
         int bci = 0;
         int oparg = 0;
         SourceMap map = getSourceMap();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/CodeUnit.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/CodeUnit.java
@@ -47,6 +47,7 @@
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -180,16 +181,18 @@ public final Signature computeSignature() {
 
     @Override
     public String toString() {
-        return toString(false);
+        return toString(false, null);
     }
 
-    protected abstract void dumpBytecode(StringBuilder sb, boolean optimized);
+    protected abstract void dumpBytecode(StringBuilder sb, boolean optimized, RootNode rootNode);
 
     /**
      * @param optimized Whether to print the initial state of the bytecode or current state, if
      *            available, where some instructions may be transformed, e.g., quickened.
+     * @param rootNode The root node if available (Bytecode DSL code unit may contain just
+     *            serialized code).
      */
-    public String toString(boolean optimized) {
+    public String toString(boolean optimized, RootNode rootNode) {
         StringBuilder sb = new StringBuilder();
 
         sb.append("Disassembly of ").append(qualname).append(":\n");
@@ -208,12 +211,12 @@ public String toString(boolean optimized) {
             sb.append("Flags: ").append(String.join(" | ", flagNames)).append("\n");
         }
 
-        dumpBytecode(sb, optimized);
+        dumpBytecode(sb, optimized, rootNode);
 
         for (Object c : constants) {
             if (c instanceof CodeUnit cd) {
                 sb.append('\n');
-                sb.append(cd.toString(optimized));
+                sb.append(cd.toString(optimized, null));
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/BytecodeDSLCodeUnit.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/BytecodeDSLCodeUnit.java
@@ -53,6 +53,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.bytecode.BytecodeRootNodes;
 import com.oracle.truffle.api.bytecode.serialization.BytecodeSerializer;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.strings.TruffleString;
 
@@ -130,13 +131,21 @@ public TruffleString getDocstring() {
     }
 
     @Override
-    protected void dumpBytecode(StringBuilder sb, boolean optimized) {
-        for (int i = 0; i < nodes.count(); i++) {
-            if (i != 0) {
+    protected void dumpBytecode(StringBuilder sb, boolean optimized, RootNode rootNode) {
+        if (nodes == null) {
+            if (rootNode instanceof PBytecodeDSLRootNode dslRoot) {
+                sb.append(dslRoot.dump());
                 sb.append('\n');
             }
-            sb.append(nodes.getNode(i).dump());
-            sb.append('\n'); // dump does not print newline at the end
+            sb.append("bytecode not available\n");
+        } else {
+            for (int i = 0; i < nodes.count(); i++) {
+                if (i != 0) {
+                    sb.append('\n');
+                }
+                sb.append(nodes.getNode(i).dump());
+                sb.append('\n'); // dump does not print newline at the end
+            }
         }
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetForeignObjectClassNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetForeignObjectClassNode.java
@@ -253,7 +253,7 @@ private PythonManagedClass resolvePolyglotForeignClass(PythonContext context, in
 
         PythonModule polyglotModule = context.lookupBuiltinModule(T_POLYGLOT);
 
-        PythonClass pythonClass = PFactory.createPythonClassAndFixupSlots(context.getLanguage(), name, base, bases);
+        PythonClass pythonClass = PFactory.createPythonClassAndFixupSlots(null, context.getLanguage(), name, base, bases);
         pythonClass.setAttribute(T___MODULE__, T_POLYGLOT);
         if (!Trait.INSTANTIABLE.isSet(traits)) {
             pythonClass.setTpSlots(pythonClass.getTpSlots().copy().set(TpSlots.TpSlotMeta.TP_NEW, null).build());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetRegisteredClassNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetRegisteredClassNode.java
@@ -191,7 +191,7 @@ private static PythonClass buildClassAndRegister(Object foreignObject,
         PythonClass pythonClass;
         try {
             // The call might not succeed if, for instance, the MRO can't be constructed
-            pythonClass = PFactory.createPythonClassAndFixupSlots(context.getLanguage(), className, bases[0], basesWithForeign);
+            pythonClass = PFactory.createPythonClassAndFixupSlots(inliningTarget, context.getLanguage(), className, bases[0], basesWithForeign);
         } catch (PException e) {
             // Catch the error to additionally print the collected classes and specify the error
             // occurred during class creation
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PFactory.java
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ private static PythonClass initClass(TruffleString className, TruffleString supe`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`private static PythonClass initClass(TruffleString className, PythonAbstractClass superClass, BuiltinDescr[] descrs, PythonModule codecsTruffleModule, PythonLanguage language) {`
`168`		`- PythonClass clazz = PFactory.createPythonClassAndFixupSlots(language, className, superClass, new PythonAbstractClass[]{superClass});`
	`168`	`+ PythonClass clazz = PFactory.createPythonClassAndFixupSlots(null, language, className, superClass, new PythonAbstractClass[]{superClass});`
`169`	`169`	`for (BuiltinDescr d : descrs) {`
`170`	`170`	`PythonUtils.createMethod(language, clazz, d.nodeFactory(), d.enclosingType ? clazz : null, 1);`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ final class AstTypeFactory {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`PythonClass makeType(TruffleString name, PythonAbstractClass base, TruffleString[] fields, TruffleString[] attributes, TruffleString[] optional, TruffleString docString) {`
`74`		`- PythonClass newType = PFactory.createPythonClassAndFixupSlots(language, name, base, new PythonAbstractClass[]{base});`
	`74`	`+ PythonClass newType = PFactory.createPythonClassAndFixupSlots(null, language, name, base, new PythonAbstractClass[]{base});`
`75`	`75`	`newType.setAttribute(T___MODULE__, T_AST);`
`76`	`76`	`newType.setAttribute(T___DOC__, docString);`
`77`	`77`	`newType.setAttribute(T__FIELDS, PFactory.createTuple(language, convertToObjectArray(fields)));`
Original file line number	Diff line number	Diff line change
`@@ -688,14 +688,14 @@ public String toString() {`
`688`	`688`	`public String toDisassembledString(boolean quickened) {`
`689`	`689`	`RootNode rootNode = getRootCallTarget().getRootNode();`
`690`	`690`	`if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER && rootNode instanceof PBytecodeDSLRootNode dslRoot) {`
`691`		`- return dslRoot.getCodeUnit().toString(quickened);`
	`691`	`+ return dslRoot.getCodeUnit().toString(quickened, dslRoot);`
`692`	`692`	`} else if (rootNode instanceof PBytecodeGeneratorRootNode r) {`
`693`	`693`	`rootNode = r.getBytecodeRootNode();`
`694`	`694`	`} else if (rootNode instanceof PBytecodeGeneratorFunctionRootNode r) {`
`695`	`695`	`rootNode = r.getBytecodeRootNode();`
`696`	`696`	`}`
`697`	`697`	`if (rootNode instanceof PBytecodeRootNode bytecodeRootNode) {`
`698`		`- return bytecodeRootNode.getCodeUnit().toString(quickened);`
	`698`	`+ return bytecodeRootNode.getCodeUnit().toString(quickened, bytecodeRootNode);`
`699`	`699`	`}`
`700`	`700`	`return J_EMPTY_STRING;`
`701`	`701`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,12 +120,12 @@ public void read(VirtualFrame frame, Node inliningTarget, PSSLSocket socket, Byt`
`120`	`120`	`* Errors are wrapped into Python exceptions. Requests for IO in non-blocking modes are`
`121`	`121`	`* indicated using Python exceptions ({@code SSLErrorWantRead}, {@code SSLErrorWantWrite}).`
`122`	`122`	`*/`
`123`		`- public void handshake(VirtualFrame frame, Node inliningTarget, PSSLSocket socket) {`
	`123`	`+ public void handshake(VirtualFrame frame, Node inliningTarget, PConstructAndRaiseNode.Lazy constructAndRaiseNode, PSSLSocket socket) {`
`124`	`124`	`if (!socket.isHandshakeComplete()) {`
`125`	`125`	`try {`
`126`	`126`	`beginHandshake(socket);`
`127`	`127`	`} catch (SSLException e) {`
`128`		`- throw handleSSLException(e);`
	`128`	`+ throw handleSSLException(inliningTarget, e, constructAndRaiseNode);`
`129`	`129`	`}`
`130`	`130`	`execute(frame, inliningTarget, socket, SSLOperationNode.EMPTY_BUFFER, SSLOperationNode.EMPTY_BUFFER, SSLOperation.HANDSHAKE);`
`131`	`131`	`}`
`@@ -268,7 +268,7 @@ static void doSocket(VirtualFrame frame, Node inliningTarget, PSSLSocket socket,`
`268`	`268`	`break;`
`269`	`269`	`}`
`270`	`270`	`} catch (SSLException e) {`
`271`		`- throw handleSSLException(e);`
	`271`	`+ throw handleSSLException(inliningTarget, e, constructAndRaiseNode);`
`272`	`272`	`} catch (OverflowException \| OutOfMemoryError node) {`
`273`	`273`	`throw raiseNode.raise(inliningTarget, MemoryError);`
`274`	`274`	`}`
`@@ -310,7 +310,7 @@ static void doMemory(VirtualFrame frame, Node inliningTarget, PSSLSocket socket,`
`310`	`310`	`throw CompilerDirectives.shouldNotReachHere("MemoryBIO-based socket operation returned WANTS_WRITE");`
`311`	`311`	`}`
`312`	`312`	`} catch (SSLException e) {`
`313`		`- throw handleSSLException(e);`
	`313`	`+ throw handleSSLException(inliningTarget, e, constructAndRaiseNode);`
`314`	`314`	`} catch (OverflowException \| OutOfMemoryError node) {`
`315`	`315`	`throw raiseNode.raise(inliningTarget, MemoryError);`
`316`	`316`	`}`
`@@ -550,10 +550,10 @@ private static SSLEngineResult doWrap(SSLEngine engine, ByteBuffer appInput, PMe`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`@TruffleBoundary`
`553`		`- private static PException handleSSLException(SSLException e) {`
	`553`	`+ private static PException handleSSLException(Node inliningTarget, SSLException e, PConstructAndRaiseNode.Lazy raiseNode) {`
`554`	`554`	`if (e.getCause() instanceof CertificateException) {`
`555`		`- throw PConstructAndRaiseNode.raiseUncachedSSLError(SSLErrorCode.ERROR_CERT_VERIFICATION, ErrorMessages.CERTIFICATE_VERIFY_FAILED, e.toString());`
	`555`	`+ throw raiseNode.get(inliningTarget).raiseSSLError(null, SSLErrorCode.ERROR_CERT_VERIFICATION, ErrorMessages.CERTIFICATE_VERIFY_FAILED, e.toString());`
`556`	`556`	`}`
`557`		`- throw PConstructAndRaiseNode.raiseUncachedSSLError(SSLErrorCode.ERROR_SSL, toTruffleStringUncached(e.toString()));`
	`557`	`+ throw raiseNode.get(inliningTarget).raiseSSLError(null, SSLErrorCode.ERROR_SSL, toTruffleStringUncached(e.toString()));`
`558`	`558`	`}`
`559`	`559`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public final class PythonBuiltinClass extends PythonManagedClass {`
`67`	`67`
`68`	`68`	`@TruffleBoundary`
`69`	`69`	`public PythonBuiltinClass(PythonLanguage lang, PythonBuiltinClassType builtinClass, PythonAbstractClass base) {`
`70`		`- super(lang, builtinClass.getType(), builtinClass.getType().getInstanceShape(lang), builtinClass.getInstanceShape(lang), builtinClass.getName(), base, new PythonAbstractClass[]{base},`
	`70`	`+ super(null, lang, builtinClass.getType(), builtinClass.getType().getInstanceShape(lang), builtinClass.getInstanceShape(lang), builtinClass.getName(), base, new PythonAbstractClass[]{base},`
`71`	`71`	`builtinClass.getSlots());`
`72`	`72`	`this.type = builtinClass;`
`73`	`73`	`}`