move most paths that raise exceptions (and thus allocate) into the nodes, they use a factory that is in the AST

timfel · timfel · commit 42f998a8f230 · 2018-10-09T14:47:45.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java
@@ -142,7 +142,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage.Env;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.Source;
 
 /**
@@ -434,41 +433,16 @@ public PythonClass getErrorClass(PythonErrorType type) {
     }
 
     @Override
-    public PException raise(PBaseException exception, Node node) {
-        PException pException = new PException(exception, node);
-        exception.setException(pException);
-        throw pException;
-    }
-
-    @Override
-    public PException raise(PythonErrorType type, Node node, String format, Object... args) {
+    @TruffleBoundary
+    public PException raise(PythonErrorType type, String format, Object... args) {
         PBaseException instance;
         PythonClass exceptionType = getErrorClass(type);
         if (format != null) {
             instance = factory.createBaseException(exceptionType, format, args);
         } else {
-            instance = factory.createBaseException(exceptionType, factory.createEmptyTuple());
+            instance = factory.createBaseException(exceptionType);
         }
-        throw raise(instance, node);
-    }
-
-    @Override
-    public PException raise(PythonErrorType type, String format, Object... args) {
-        return raise(type, null, format, args);
-    }
-
-    @Override
-    public PException raise(PythonErrorType type) {
-        throw raise(factory.createBaseException(getErrorClass(type)), null);
-    }
-
-    @Override
-    public PException raise(PythonClass exceptionType, Node node) {
-        throw raise(factory.createBaseException(exceptionType), node);
-    }
-
-    public PException raise(PythonErrorType type, Node node) {
-        throw raise(factory.createBaseException(getErrorClass(type)), node);
+        throw PException.fromObject(instance, null);
     }
 
     private void publishBuiltinModules() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -313,7 +313,7 @@ private PComplex convertStringToComplex(String str, PythonClass cls) {
             }
 
             if (s == n) {
-                throw getCore().raise(ValueError, "empty string for complex()");
+                throw raise(ValueError, "empty string for complex()");
             }
 
             double z = -1.0;
@@ -378,7 +378,7 @@ private PComplex convertStringToComplex(String str, PythonClass cls) {
                         int end = endDouble(str, s);
                         z = Double.valueOf(str.substring(s, end)).doubleValue();
                         if (z == Double.POSITIVE_INFINITY) {
-                            throw getCore().raise(ValueError, String.format("float() out of range: %.150s", str));
+                            throw raise(ValueError, String.format("float() out of range: %.150s", str));
                         }
 
                         s = end;
@@ -406,7 +406,7 @@ private PComplex convertStringToComplex(String str, PythonClass cls) {
             } while (s < n && !swError);
 
             if (swError) {
-                throw getCore().raise(ValueError, "malformed string for complex() %s", str.substring(s));
+                throw raise(ValueError, "malformed string for complex() %s", str.substring(s));
             }
 
             return factory().createComplex(cls, x, y);
@@ -627,7 +627,7 @@ private double convertStringToDouble(String str) {
             for (int i = 0; i < n; i++) {
                 char ch = str.charAt(i);
                 if (ch == '\u0000') {
-                    throw getCore().raise(ValueError, "empty string for complex()");
+                    throw raise(ValueError, "empty string for complex()");
                 }
                 if (Character.isDigit(ch)) {
                     if (s == null) {
@@ -654,7 +654,7 @@ private double convertStringToDouble(String str) {
                 return Double.valueOf(sval).doubleValue();
             } catch (NumberFormatException exc) {
                 // throw Py.ValueError("invalid literal for __float__: " + str);
-                throw getCore().raise(ValueError, "could not convert string to float: %s", str);
+                throw raise(ValueError, "could not convert string to float: %s", str);
             }
         }
 
@@ -793,7 +793,7 @@ private Object stringToInt(String num, int base) {
                     return bi.intValue();
                 }
             } else {
-                throw getCore().raise(ValueError, "base is out of range for int()");
+                throw raise(ValueError, "base is out of range for int()");
             }
         }
 
@@ -815,7 +815,7 @@ private Object toInt(Object arg1, Object arg2) {
             if (arg1 instanceof String && arg2 instanceof Integer) {
                 return stringToInt((String) arg1, (Integer) arg2);
             } else {
-                throw getCore().raise(ValueError, "invalid base or val for int()");
+                throw raise(ValueError, "invalid base or val for int()");
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -1211,7 +1211,7 @@ public Object repr(Object obj,
             if (isString.profile(result instanceof String) || isPString.profile(result instanceof PString)) {
                 return result;
             }
-            throw getCore().raise(TypeError, "__repr__ returned non-string (type %p)", obj);
+            throw raise(TypeError, "__repr__ returned non-string (type %p)", obj);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java
@@ -398,7 +398,7 @@ String decodeBytes(ByteBuffer bytes, String encoding, String errors) {
                 CharBuffer decoded = charset.newDecoder().onMalformedInput(errorAction).onUnmappableCharacter(errorAction).decode(bytes);
                 return String.valueOf(decoded);
             } catch (IllegalArgumentException e) {
-                throw this.getCore().raise(LookupError, "unknown encoding: %s", encoding);
+                throw this.raise(LookupError, "unknown encoding: %s", encoding);
             } catch (CharacterCodingException e) {
                 throw raise(UnicodeDecodeError, "%s", e.getMessage());
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java
@@ -226,7 +226,7 @@ protected GetStackTraceRootNode(PythonLanguage language) {
             @Override
             public Object execute(VirtualFrame frame) {
                 CompilerDirectives.transferToInterpreter();
-                throw contextRef.get().getCore().raise(ValueError);
+                throw contextRef.get().getCore().raise(ValueError, null);
             }
 
             @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -325,8 +325,7 @@ Object run(@SuppressWarnings("unused") PythonClass typ, PBaseException val, @Sup
             if (val.getException() != null) {
                 getContext().setCurrentException(val.getException());
             } else {
-                PException pException = new PException(val, this);
-                val.setException(pException);
+                PException pException = PException.fromObject(val, this);
                 getContext().setCurrentException(pException);
             }
             return PNone.NONE;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java
@@ -319,7 +319,7 @@ Object run(PDict self, Object key,
             if (delItemNode.execute(self, self.getDictStorage(), key)) {
                 return PNone.NONE;
             }
-            throw getCore().raise(KeyError, this, "%s", key);
+            throw raise(KeyError, "%s", key);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorBuiltins.java
@@ -155,8 +155,7 @@ Object sendThrow(VirtualFrame frame, PGenerator self, PythonClass typ, @Suppress
                         @Cached("create(__CALL__)") LookupAndCallVarargsNode callTyp) {
             Object instance = callTyp.execute(frame, typ, new Object[0]);
             if (instance instanceof PBaseException) {
-                PException pException = new PException((PBaseException) instance, this);
-                ((PBaseException) instance).setException(pException);
+                PException pException = PException.fromObject((PBaseException) instance, this);
                 PArguments.setSpecialArgument(self.getArguments(), pException);
             } else {
                 throw raise(TypeError, "exceptions must derive from BaseException");
@@ -169,8 +168,7 @@ Object sendThrow(VirtualFrame frame, PGenerator self, PythonClass typ, PTuple va
                         @Cached("create(__CALL__)") LookupAndCallVarargsNode callTyp) {
             Object instance = callTyp.execute(frame, typ, val.getArray());
             if (instance instanceof PBaseException) {
-                PException pException = new PException((PBaseException) instance, this);
-                ((PBaseException) instance).setException(pException);
+                PException pException = PException.fromObject((PBaseException) instance, this);
                 PArguments.setSpecialArgument(self.getArguments(), pException);
             } else {
                 throw raise(TypeError, "exceptions must derive from BaseException");
@@ -183,8 +181,7 @@ Object sendThrow(VirtualFrame frame, PGenerator self, PythonClass typ, Object va
                         @Cached("create(__CALL__)") LookupAndCallVarargsNode callTyp) {
             Object instance = callTyp.execute(frame, typ, new Object[]{val});
             if (instance instanceof PBaseException) {
-                PException pException = new PException((PBaseException) instance, this);
-                ((PBaseException) instance).setException(pException);
+                PException pException = PException.fromObject((PBaseException) instance, this);
                 PArguments.setSpecialArgument(self.getArguments(), pException);
             } else {
                 throw raise(TypeError, "exceptions must derive from BaseException");
@@ -194,16 +191,14 @@ Object sendThrow(VirtualFrame frame, PGenerator self, PythonClass typ, Object va
 
         @Specialization
         Object sendThrow(PGenerator self, PBaseException instance, @SuppressWarnings("unused") PNone val, @SuppressWarnings("unused") PNone tb) {
-            PException pException = new PException(instance, this);
-            instance.setException(pException);
+            PException pException = PException.fromObject(instance, this);
             PArguments.setSpecialArgument(self.getArguments(), pException);
             return resumeGenerator(self);
         }
 
         @Specialization
         Object sendThrow(PGenerator self, @SuppressWarnings("unused") PythonClass typ, PBaseException instance, PTraceback tb) {
-            PException pException = new PException(instance, this);
-            instance.setException(pException);
+            PException pException = PException.fromObject(instance, this);
             instance.setTraceback(tb);
             PArguments.setSpecialArgument(self.getArguments(), pException);
             return resumeGenerator(self);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java
@@ -55,13 +55,13 @@
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PGuards;
+import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -94,7 +94,7 @@ abstract static class GetSetGetNode extends PythonTernaryBuiltinNode {
         // https://github.com/python/cpython/blob/e8b19656396381407ad91473af5da8b0d4346e88/Objects/descrobject.c#L149
         @Specialization
         Object get(GetSetDescriptor descr, Object obj, PythonClass type) {
-            if (descr_check(getCore(), descr, obj, type)) {
+            if (descr_check(this, descr, obj, type)) {
                 return descr;
             }
             if (descr.getGet() != null) {
@@ -116,7 +116,7 @@ abstract static class GetSetSetNode extends PythonTernaryBuiltinNode {
         @Specialization
         Object set(GetSetDescriptor descr, Object obj, Object value) {
             // the noneType is not important here - there are no setters on None
-            if (descr_check(getCore(), descr, obj, getClassNode.execute(obj))) {
+            if (descr_check(this, descr, obj, getClassNode.execute(obj))) {
                 return descr;
             }
             if (descr.getSet() != null) {
@@ -129,7 +129,7 @@ Object set(GetSetDescriptor descr, Object obj, Object value) {
     }
 
     // https://github.com/python/cpython/blob/e8b19656396381407ad91473af5da8b0d4346e88/Objects/descrobject.c#L70
-    private static boolean descr_check(PythonCore core, GetSetDescriptor descr, Object obj, PythonClass type) {
+    private static boolean descr_check(PNodeWithContext node, GetSetDescriptor descr, Object obj, PythonClass type) {
         if (PGuards.isNone(obj)) {
             if (!(type instanceof PythonBuiltinClass) || ((PythonBuiltinClass) type).getType() != PythonBuiltinClassType.PNone) {
                 return true;
@@ -141,6 +141,6 @@ private static boolean descr_check(PythonCore core, GetSetDescriptor descr, Obje
             }
         }
 
-        throw core.raise(TypeError, "descriptor '%s' for '%s' objects doesn't apply to '%s' object", descr.getName(), descr.getType().getName(), type.getName());
+        throw node.raise(TypeError, "descriptor '%s' for '%s' objects doesn't apply to '%s' object", descr.getName(), descr.getType().getName(), type.getName());
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java
@@ -980,7 +980,7 @@ private void shiftError(long shiftCount) {
             if (shiftCount >= Integer.SIZE) {
                 throw new ArithmeticException("integer overflow");
             } else if (shiftCount < 0) {
-                throw getCore().raise(ValueError, "negative shift count");
+                throw raise(ValueError, "negative shift count");
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/SetNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/SetNodes.java
@@ -110,7 +110,7 @@ public PSet setIterable(PythonClass cls, Object iterable,
 
         @Fallback
         public PSet setObject(@SuppressWarnings("unused") Object cls, Object value) {
-            throw getCore().raise(TypeError, this, "'%p' object is not iterable", value);
+            throw raise(TypeError, "'%p' object is not iterable", value);
         }
 
         private SetItemNode getSetItemNode() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java
@@ -76,19 +76,20 @@ public final NodeFactory getNodeFactory() {
     }
 
     public final PException raise(PBaseException exc) {
-        throw getCore().raise(exc, this);
+        throw PException.fromObject(exc, this);
     }
 
     public final PException raise(PythonErrorType type) {
-        throw getCore().raise(type, this);
+        throw raise(getCore().getErrorClass(type));
     }
 
-    public final PException raise(PythonErrorType type, String format) {
-        throw getCore().raise(type, this, format);
+    public PException raise(PythonClass exceptionType) {
+        throw raise(factory().createBaseException(exceptionType));
     }
 
     public final PException raise(PythonErrorType type, String format, Object... arguments) {
-        throw getCore().raise(type, this, format, arguments);
+        assert format != null;
+        throw raise(factory().createBaseException(getCore().getErrorClass(type), format, arguments));
     }
 
     public final PException raiseIndexError() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/RaiseNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/RaiseNode.java
@@ -65,15 +65,15 @@ public void reraise(PNone type, Object cause,
     }
 
     @Specialization
-    public void raise(PBaseException exception, PNone cause) {
-        throw getCore().raise(exception, this);
+    public void doRaise(PBaseException exception, PNone cause) {
+        throw raise(exception);
     }
 
     @Specialization(guards = "!isPNone(cause)")
-    public void raise(PBaseException exception, Object cause,
+    public void doRaise(PBaseException exception, Object cause,
                     @Cached("create()") WriteAttributeToObjectNode writeCause) {
         writeCause.execute(exception, SpecialAttributeNames.__CAUSE__, cause);
-        throw getCore().raise(exception, this);
+        throw raise(exception);
     }
 
     private void checkBaseClass(PythonClass pythonClass) {
@@ -91,22 +91,22 @@ private void checkBaseClass(PythonClass pythonClass) {
     }
 
     @Specialization
-    public void raise(PythonClass pythonClass, PNone cause) {
+    public void doRaise(PythonClass pythonClass, PNone cause) {
         checkBaseClass(pythonClass);
-        throw getCore().raise(factory().createBaseException(pythonClass), this);
+        throw raise(pythonClass);
     }
 
     @Specialization(guards = "!isPNone(cause)")
-    public void raise(PythonClass pythonClass, Object cause,
+    public void doRaise(PythonClass pythonClass, Object cause,
                     @Cached("create()") WriteAttributeToObjectNode writeCause) {
         checkBaseClass(pythonClass);
         PBaseException pythonException = factory().createBaseException(pythonClass);
         writeCause.execute(pythonException, SpecialAttributeNames.__CAUSE__, cause);
-        throw getCore().raise(pythonException, this);
+        throw raise(pythonException);
     }
 
     @Fallback
-    public void raise(Object exception, Object cause) {
+    public void doRaise(Object exception, Object cause) {
         throw raise(TypeError, "exceptions must derive from BaseException");
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java
@@ -83,8 +83,7 @@ public void executeVoid(VirtualFrame frame) {
                 if (e instanceof ControlFlowException) {
                     throw e;
                 } else {
-                    PException pe = new PException(getBaseException(e), this);
-                    pe.getExceptionObject().setException(pe);
+                    PException pe = PException.fromObject(getBaseException(e), this);
                     try {
                         catchException(frame, pe, exceptionState);
                     } catch (PException pe_thrown) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java
@@ -135,6 +135,6 @@ public SourceSection getSourceSection() {
         instance.setAttribute("lineno", section.getStartLine());
         instance.setAttribute("offset", section.getStartColumn());
         instance.setAttribute("msg", section.getCharIndex() == source.getLength() ? "unexpected EOF while parsing" : "invalid syntax");
-        throw core.raise(instance, location);
+        throw PException.fromObject(instance, location);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ private PComplex convertStringToComplex(String str, PythonClass cls) {`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`if (s == n) {`
`316`		`- throw getCore().raise(ValueError, "empty string for complex()");`
	`316`	`+ throw raise(ValueError, "empty string for complex()");`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`double z = -1.0;`
`@@ -378,7 +378,7 @@ private PComplex convertStringToComplex(String str, PythonClass cls) {`
`378`	`378`	`int end = endDouble(str, s);`
`379`	`379`	`z = Double.valueOf(str.substring(s, end)).doubleValue();`
`380`	`380`	`if (z == Double.POSITIVE_INFINITY) {`
`381`		`- throw getCore().raise(ValueError, String.format("float() out of range: %.150s", str));`
	`381`	`+ throw raise(ValueError, String.format("float() out of range: %.150s", str));`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`s = end;`
`@@ -406,7 +406,7 @@ private PComplex convertStringToComplex(String str, PythonClass cls) {`
`406`	`406`	`} while (s < n && !swError);`
`407`	`407`
`408`	`408`	`if (swError) {`
`409`		`- throw getCore().raise(ValueError, "malformed string for complex() %s", str.substring(s));`
	`409`	`+ throw raise(ValueError, "malformed string for complex() %s", str.substring(s));`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`return factory().createComplex(cls, x, y);`
`@@ -627,7 +627,7 @@ private double convertStringToDouble(String str) {`
`627`	`627`	`for (int i = 0; i < n; i++) {`
`628`	`628`	`char ch = str.charAt(i);`
`629`	`629`	`if (ch == '\u0000') {`
`630`		`- throw getCore().raise(ValueError, "empty string for complex()");`
	`630`	`+ throw raise(ValueError, "empty string for complex()");`
`631`	`631`	`}`
`632`	`632`	`if (Character.isDigit(ch)) {`
`633`	`633`	`if (s == null) {`
`@@ -654,7 +654,7 @@ private double convertStringToDouble(String str) {`
`654`	`654`	`return Double.valueOf(sval).doubleValue();`
`655`	`655`	`} catch (NumberFormatException exc) {`
`656`	`656`	`// throw Py.ValueError("invalid literal for __float__: " + str);`
`657`		`- throw getCore().raise(ValueError, "could not convert string to float: %s", str);`
	`657`	`+ throw raise(ValueError, "could not convert string to float: %s", str);`
`658`	`658`	`}`
`659`	`659`	`}`
`660`	`660`
`@@ -793,7 +793,7 @@ private Object stringToInt(String num, int base) {`
`793`	`793`	`return bi.intValue();`
`794`	`794`	`}`
`795`	`795`	`} else {`
`796`		`- throw getCore().raise(ValueError, "base is out of range for int()");`
	`796`	`+ throw raise(ValueError, "base is out of range for int()");`
`797`	`797`	`}`
`798`	`798`	`}`
`799`	`799`
`@@ -815,7 +815,7 @@ private Object toInt(Object arg1, Object arg2) {`
`815`	`815`	`if (arg1 instanceof String && arg2 instanceof Integer) {`
`816`	`816`	`return stringToInt((String) arg1, (Integer) arg2);`
`817`	`817`	`} else {`
`818`		`- throw getCore().raise(ValueError, "invalid base or val for int()");`
	`818`	`+ throw raise(ValueError, "invalid base or val for int()");`
`819`	`819`	`}`
`820`	`820`	`}`
`821`	`821`
Original file line number	Diff line number	Diff line change
`@@ -1211,7 +1211,7 @@ public Object repr(Object obj,`
`1211`	`1211`	`if (isString.profile(result instanceof String) \|\| isPString.profile(result instanceof PString)) {`
`1212`	`1212`	`return result;`
`1213`	`1213`	`}`
`1214`		`- throw getCore().raise(TypeError, "__repr__ returned non-string (type %p)", obj);`
	`1214`	`+ throw raise(TypeError, "__repr__ returned non-string (type %p)", obj);`
`1215`	`1215`	`}`
`1216`	`1216`	`}`
`1217`	`1217`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ String decodeBytes(ByteBuffer bytes, String encoding, String errors) {`
`398`	`398`	`CharBuffer decoded = charset.newDecoder().onMalformedInput(errorAction).onUnmappableCharacter(errorAction).decode(bytes);`
`399`	`399`	`return String.valueOf(decoded);`
`400`	`400`	`} catch (IllegalArgumentException e) {`
`401`		`- throw this.getCore().raise(LookupError, "unknown encoding: %s", encoding);`
	`401`	`+ throw this.raise(LookupError, "unknown encoding: %s", encoding);`
`402`	`402`	`} catch (CharacterCodingException e) {`
`403`	`403`	`throw raise(UnicodeDecodeError, "%s", e.getMessage());`
`404`	`404`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ protected GetStackTraceRootNode(PythonLanguage language) {`
`226`	`226`	`@Override`
`227`	`227`	`public Object execute(VirtualFrame frame) {`
`228`	`228`	`CompilerDirectives.transferToInterpreter();`
`229`		`- throw contextRef.get().getCore().raise(ValueError);`
	`229`	`+ throw contextRef.get().getCore().raise(ValueError, null);`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ Object run(PDict self, Object key,`
`319`	`319`	`if (delItemNode.execute(self, self.getDictStorage(), key)) {`
`320`	`320`	`return PNone.NONE;`
`321`	`321`	`}`
`322`		`- throw getCore().raise(KeyError, this, "%s", key);`
	`322`	`+ throw raise(KeyError, "%s", key);`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`
Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,7 @@ private void shiftError(long shiftCount) {`
`980`	`980`	`if (shiftCount >= Integer.SIZE) {`
`981`	`981`	`throw new ArithmeticException("integer overflow");`
`982`	`982`	`} else if (shiftCount < 0) {`
`983`		`- throw getCore().raise(ValueError, "negative shift count");`
	`983`	`+ throw raise(ValueError, "negative shift count");`
`984`	`984`	`}`
`985`	`985`	`}`
`986`	`986`