put getting the message of a JavaException behind a TruffleBoundary more conveniently

timfel · timfel · commit d550d77f3a66 · 2018-11-15T09:08:47.000+01:00
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
@@ -1604,7 +1604,7 @@ String input(@SuppressWarnings("unused") PNone prompt) {
                 buf.rewind();
                 return buf.toString();
             } catch (IOException e) {
-                throw raise(PythonBuiltinClassType.EOFError, e.getMessage());
+                throw raise(PythonBuiltinClassType.EOFError, e);
             }
         }
 
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
@@ -315,7 +315,7 @@ private PBytes encodeString(String self, String encoding, String errors) {
             } catch (IllegalArgumentException e) {
                 throw raise(LookupError, "unknown encoding: %s", encoding);
             } catch (CharacterCodingException e) {
-                throw raise(UnicodeEncodeError, "%s", e.getMessage());
+                throw raise(UnicodeEncodeError, e);
             }
         }
 
@@ -375,7 +375,7 @@ private Object[] encodeString(String self, String errors) {
                 // TODO(fa): bytes object creation should not be behind a TruffleBoundary
                 return new Object[]{factory().createBytes(data), codePoints};
             } catch (CharacterCodingException e) {
-                throw raise(UnicodeEncodeError, "%s", e.getMessage());
+                throw raise(UnicodeEncodeError, e);
             }
         }
 
@@ -443,7 +443,7 @@ String decodeBytes(ByteBuffer bytes, String encoding, String errors) {
             } catch (IllegalArgumentException e) {
                 throw raise(LookupError, "unknown encoding: %s", encoding);
             } catch (CharacterCodingException e) {
-                throw raise(UnicodeDecodeError, "%s", e.getMessage());
+                throw raise(UnicodeDecodeError, e);
             }
         }
     }
@@ -504,7 +504,7 @@ String decodeBytes(ByteBuffer bytes, String errors) {
                 CharBuffer decoded = charset.newDecoder().onMalformedInput(errorAction).onUnmappableCharacter(errorAction).decode(buf);
                 return String.valueOf(decoded);
             } catch (CharacterCodingException e) {
-                throw raise(UnicodeDecodeError, "%s", e.getMessage());
+                throw raise(UnicodeDecodeError, e);
             }
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java
@@ -267,6 +267,7 @@ private CheckFunctionResultNode getCheckResultNode() {
             return checkResultNode;
         }
 
+        @TruffleBoundary
         private PException reportImportError(RuntimeException e, String path) {
             StringBuilder sb = new StringBuilder();
             sb.append(e.getMessage());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/InteropModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/InteropModuleBuiltins.java
@@ -229,7 +229,7 @@ Object read(TruffleObject receiver, Object key,
             try {
                 return ForeignAccess.sendRead(readNode, receiver, key);
             } catch (UnknownIdentifierException | UnsupportedMessageException e) {
-                throw raise(PythonErrorType.AttributeError, e.getMessage());
+                throw raise(PythonErrorType.AttributeError, e);
             }
         }
     }
@@ -244,7 +244,7 @@ Object write(TruffleObject receiver, Object key, Object value,
             try {
                 return ForeignAccess.sendWrite(writeNode, receiver, key, value);
             } catch (UnknownIdentifierException | UnsupportedMessageException | UnsupportedTypeException e) {
-                throw raise(PythonErrorType.AttributeError, e.getMessage());
+                throw raise(PythonErrorType.AttributeError, e);
             }
         }
     }
@@ -259,7 +259,7 @@ Object remove(TruffleObject receiver, Object key,
             try {
                 return ForeignAccess.sendRemove(removeNode, receiver, key);
             } catch (UnknownIdentifierException | UnsupportedMessageException e) {
-                throw raise(PythonErrorType.AttributeError, e.getMessage());
+                throw raise(PythonErrorType.AttributeError, e);
             }
         }
     }
@@ -274,7 +274,7 @@ Object remove(TruffleObject receiver, Object[] arguments,
             try {
                 return ForeignAccess.sendExecute(executeNode, receiver, arguments);
             } catch (UnsupportedMessageException | UnsupportedTypeException | ArityException e) {
-                throw raise(PythonErrorType.AttributeError, e.getMessage());
+                throw raise(PythonErrorType.AttributeError, e);
             }
         }
     }
@@ -289,7 +289,7 @@ Object remove(TruffleObject receiver, Object[] arguments,
             try {
                 return ForeignAccess.sendNew(executeNode, receiver, arguments);
             } catch (UnsupportedMessageException | UnsupportedTypeException | ArityException e) {
-                throw raise(PythonErrorType.AttributeError, e.getMessage());
+                throw raise(PythonErrorType.AttributeError, e);
             }
         }
     }
@@ -304,7 +304,7 @@ Object remove(TruffleObject receiver, String key, Object[] arguments,
             try {
                 return ForeignAccess.sendInvoke(executeNode, receiver, key, arguments);
             } catch (UnsupportedMessageException | UnsupportedTypeException | ArityException | UnknownIdentifierException e) {
-                throw raise(PythonErrorType.AttributeError, e.getMessage());
+                throw raise(PythonErrorType.AttributeError, e);
             }
         }
     }
@@ -346,7 +346,7 @@ Object remove(TruffleObject receiver,
             try {
                 return ForeignAccess.sendGetSize(executeNode, receiver);
             } catch (UnsupportedMessageException e) {
-                throw raise(PythonErrorType.TypeError, e.getMessage());
+                throw raise(PythonErrorType.TypeError, e);
             }
         }
     }
@@ -399,7 +399,7 @@ TruffleObject remove(TruffleObject receiver,
             try {
                 return ForeignAccess.sendKeys(executeNode, receiver);
             } catch (UnsupportedMessageException e) {
-                throw raise(PythonErrorType.TypeError, e.getMessage());
+                throw raise(PythonErrorType.TypeError, e);
             }
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -587,7 +587,7 @@ Object open(String pathname, int flags, int fileMode, @SuppressWarnings("unused"
                 return getResources().open(truffleFile, fc);
             } catch (IOException e) {
                 gotException.enter();
-                throw raise(OSError, e.getMessage());
+                throw raise(OSError, e);
             }
         }
 
@@ -659,7 +659,7 @@ Object lseek(int fd, long pos, int how,
                 return setPosition(pos, how, fc);
             } catch (IOException e) {
                 gotException.enter();
-                throw raise(OSError, e.getMessage());
+                throw raise(OSError, e);
             }
         }
 
@@ -699,7 +699,7 @@ Object close(int fd,
                     closeChannel(channel);
                 } catch (IOException e) {
                     gotException.enter();
-                    throw raise(OSError, e.getMessage());
+                    throw raise(OSError, e);
                 }
             }
             return PNone.NONE;
@@ -723,7 +723,7 @@ Object unlink(String path) {
                 getContext().getEnv().getTruffleFile(path).delete();
             } catch (RuntimeException | IOException e) {
                 gotException.enter();
-                throw raise(OSError, e.getMessage());
+                throw raise(OSError, e);
             }
             return PNone.NONE;
         }
@@ -756,7 +756,7 @@ Object mkdir(String path, @SuppressWarnings("unused") int mode, @SuppressWarning
                 getContext().getEnv().getTruffleFile(path).createDirectory();
             } catch (RuntimeException | IOException e) {
                 gotException.enter();
-                throw raise(OSError, e.getMessage());
+                throw raise(OSError, e);
             }
             return PNone.NONE;
         }
@@ -781,7 +781,7 @@ Object write(int fd, byte[] data,
                     return doWriteOp(data, (WritableByteChannel) channel);
                 } catch (NonWritableChannelException | IOException e) {
                     gotException.enter();
-                    throw raise(OSError, e.getMessage());
+                    throw raise(OSError, e);
                 }
             } else {
                 notWritable.enter();
@@ -849,7 +849,7 @@ ByteSequenceStorage readSeekable(SeekableByteChannel channel, int size) {
                 availableSize = availableSize(channel);
             } catch (IOException e) {
                 gotException.enter();
-                throw raise(OSError, e.getMessage());
+                throw raise(OSError, e);
             }
             if (availableSize > ReadNode.MAX_READ) {
                 availableSize = ReadNode.MAX_READ;
@@ -902,7 +902,7 @@ private int readIntoBuffer(ReadableByteChannel readableChannel, ByteBuffer dst)
                 return readableChannel.read(dst);
             } catch (IOException e) {
                 gotException.enter();
-                throw raise(OSError, e.getMessage());
+                throw raise(OSError, e);
             }
         }
 
@@ -1003,7 +1003,7 @@ Object chmod(String path, int mode, @SuppressWarnings("unused") PNone dir_fd, @S
                 truffleFile.setPosixPermissions(permissions);
             } catch (IOException e) {
                 gotException.enter();
-                throw raise(OSError, e.getMessage());
+                throw raise(OSError, e);
             }
             return PNone.NONE;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ReadlineModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ReadlineModuleBuiltins.java
@@ -258,7 +258,7 @@ PNone setCompleter(PythonModule self, String path,
                 }
                 reader.close();
             } catch (IOException e) {
-                throw raise(PythonErrorType.IOError, e.getMessage());
+                throw raise(PythonErrorType.IOError, e);
             }
             return PNone.NONE;
         }
@@ -286,7 +286,7 @@ PNone setCompleter(PythonModule self, String path,
                 }
                 writer.close();
             } catch (IOException e) {
-                throw raise(PythonErrorType.IOError, e.getMessage());
+                throw raise(PythonErrorType.IOError, e);
             }
             return PNone.NONE;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SignalModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SignalModuleBuiltins.java
@@ -147,7 +147,7 @@ Object signal(int signum, int id) {
             try {
                 retval = Signals.setSignalHandler(signum, id);
             } catch (IllegalArgumentException e) {
-                throw raise(PythonErrorType.ValueError, e.getMessage());
+                throw raise(PythonErrorType.ValueError, e);
             }
             if ((int) retval == Signals.SIG_UNKNOWN) {
                 if (signalHandlers.containsKey(signum)) {
@@ -167,7 +167,7 @@ private Object installSignalHandler(int signum, PythonCallable handler, RootCall
                     callTarget.call(arguments);
                 });
             } catch (IllegalArgumentException e) {
-                throw raise(PythonErrorType.ValueError, e.getMessage());
+                throw raise(PythonErrorType.ValueError, e);
             }
             if ((int) retval == Signals.SIG_UNKNOWN) {
                 if (signalHandlers.containsKey(signum)) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/AccessForeignItemNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/AccessForeignItemNodes.java
@@ -121,7 +121,7 @@ public Object doForeignObjectSlice(TruffleObject object, PSlice idxSlice,
                 mslice = materializeSlice(idxSlice, object, getSizeNode, foreign2PTypeNode);
             } catch (InteropException e) {
                 CompilerDirectives.transferToInterpreter();
-                throw raise(RuntimeError, e.getMessage());
+                throw raise(RuntimeError, e);
             }
             Object[] values = new Object[mslice.length];
             for (int i = mslice.start, j = 0; i < mslice.stop; i += mslice.step, j++) {
@@ -225,7 +225,7 @@ public Object doForeignObjectSlice(TruffleObject object, PSlice idxSlice, PSeque
                 return PNone.NONE;
             } catch (InteropException e) {
                 CompilerDirectives.transferToInterpreter();
-                throw raise(RuntimeError, e.getMessage());
+                throw raise(RuntimeError, e);
             }
         }
 
@@ -243,7 +243,7 @@ public Object doForeignObject(TruffleObject object, Object idx, Object value,
                 return writeForeignValue(object, convertedIdx, convertedValue, foreignWrite, keyInfoNode, hasSizeNode, foreign2PTypeNode);
             } catch (InteropException e) {
                 CompilerDirectives.transferToInterpreter();
-                throw raise(RuntimeError, e.getMessage());
+                throw raise(RuntimeError, e);
             }
         }
 
@@ -283,7 +283,7 @@ public Object doForeignObjectSlice(TruffleObject object, PSlice idxSlice,
                 return PNone.NONE;
             } catch (InteropException e) {
                 CompilerDirectives.transferToInterpreter();
-                throw raise(RuntimeError, e.getMessage());
+                throw raise(RuntimeError, e);
             }
         }
 
@@ -298,7 +298,7 @@ public Object doForeignObject(TruffleObject object, Object idx,
                 return removeForeignValue(object, convertedIdx, foreignRemove, keyInfoNode, hasSizeNode);
             } catch (InteropException e) {
                 CompilerDirectives.transferToInterpreter();
-                throw raise(RuntimeError, e.getMessage());
+                throw raise(RuntimeError, e);
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java
@@ -1242,7 +1242,7 @@ private Object encodeString(String self, String encoding, String errors) {
             } catch (IllegalArgumentException e) {
                 throw raise(LookupError, "unknown encoding: %s", encoding);
             } catch (CharacterCodingException e) {
-                throw raise(UnicodeEncodeError, "%s", e.getMessage());
+                throw raise(UnicodeEncodeError, e);
             }
         }
     }
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
@@ -53,6 +53,7 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -90,6 +91,15 @@ public final PException raise(PythonBuiltinClassType type, String format, Object
         throw raise(factory().createBaseException(type, format, arguments));
     }
 
+    public final PException raise(PythonBuiltinClassType type, Exception e) {
+        throw raise(type, getMessage(e));
+    }
+
+    @TruffleBoundary
+    private static final String getMessage(Exception e) {
+        return e.getMessage();
+    }
+
     public final PException raiseIndexError() {
         return raise(PythonErrorType.IndexError, "cannot fit 'int' into an index-sized integer");
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/PythonCallNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/PythonCallNode.java
@@ -244,10 +244,10 @@ Object call(VirtualFrame frame, ForeignInvoke callable,
             return fromForeign.executeConvert(ForeignAccess.sendInvoke(invokeNode, callable.receiver, callable.identifier, arguments));
         } catch (UnknownIdentifierException e) {
             nameError.enter();
-            throw raise(PythonErrorType.NameError, e.getMessage());
+            throw raise(PythonErrorType.NameError, e);
         } catch (ArityException | UnsupportedTypeException e) {
             typeError.enter();
-            throw raise(PythonErrorType.TypeError, e.getMessage());
+            throw raise(PythonErrorType.TypeError, e);
         } catch (UnsupportedMessageException e) {
             invokeError.enter();
             // the interop contract is to revert to READ and then EXECUTE

Original file line number	Diff line number	Diff line change
`@@ -1604,7 +1604,7 @@ String input(@SuppressWarnings("unused") PNone prompt) {`
`1604`	`1604`	`buf.rewind();`
`1605`	`1605`	`return buf.toString();`
`1606`	`1606`	`} catch (IOException e) {`
`1607`		`- throw raise(PythonBuiltinClassType.EOFError, e.getMessage());`
	`1607`	`+ throw raise(PythonBuiltinClassType.EOFError, e);`
`1608`	`1608`	`}`
`1609`	`1609`	`}`
`1610`	`1610`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ private PBytes encodeString(String self, String encoding, String errors) {`
`315`	`315`	`} catch (IllegalArgumentException e) {`
`316`	`316`	`throw raise(LookupError, "unknown encoding: %s", encoding);`
`317`	`317`	`} catch (CharacterCodingException e) {`
`318`		`- throw raise(UnicodeEncodeError, "%s", e.getMessage());`
	`318`	`+ throw raise(UnicodeEncodeError, e);`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`
`@@ -375,7 +375,7 @@ private Object[] encodeString(String self, String errors) {`
`375`	`375`	`// TODO(fa): bytes object creation should not be behind a TruffleBoundary`
`376`	`376`	`return new Object[]{factory().createBytes(data), codePoints};`
`377`	`377`	`} catch (CharacterCodingException e) {`
`378`		`- throw raise(UnicodeEncodeError, "%s", e.getMessage());`
	`378`	`+ throw raise(UnicodeEncodeError, e);`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`
`@@ -443,7 +443,7 @@ String decodeBytes(ByteBuffer bytes, String encoding, String errors) {`
`443`	`443`	`} catch (IllegalArgumentException e) {`
`444`	`444`	`throw raise(LookupError, "unknown encoding: %s", encoding);`
`445`	`445`	`} catch (CharacterCodingException e) {`
`446`		`- throw raise(UnicodeDecodeError, "%s", e.getMessage());`
	`446`	`+ throw raise(UnicodeDecodeError, e);`
`447`	`447`	`}`
`448`	`448`	`}`
`449`	`449`	`}`
`@@ -504,7 +504,7 @@ String decodeBytes(ByteBuffer bytes, String errors) {`
`504`	`504`	`CharBuffer decoded = charset.newDecoder().onMalformedInput(errorAction).onUnmappableCharacter(errorAction).decode(buf);`
`505`	`505`	`return String.valueOf(decoded);`
`506`	`506`	`} catch (CharacterCodingException e) {`
`507`		`- throw raise(UnicodeDecodeError, "%s", e.getMessage());`
	`507`	`+ throw raise(UnicodeDecodeError, e);`
`508`	`508`	`}`
`509`	`509`	`}`
`510`	`510`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,7 @@ private CheckFunctionResultNode getCheckResultNode() {`
`267`	`267`	`return checkResultNode;`
`268`	`268`	`}`
`269`	`269`
	`270`	`+ @TruffleBoundary`
`270`	`271`	`private PException reportImportError(RuntimeException e, String path) {`
`271`	`272`	`StringBuilder sb = new StringBuilder();`
`272`	`273`	`sb.append(e.getMessage());`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ Object read(TruffleObject receiver, Object key,`
`229`	`229`	`try {`
`230`	`230`	`return ForeignAccess.sendRead(readNode, receiver, key);`
`231`	`231`	`} catch (UnknownIdentifierException \| UnsupportedMessageException e) {`
`232`		`- throw raise(PythonErrorType.AttributeError, e.getMessage());`
	`232`	`+ throw raise(PythonErrorType.AttributeError, e);`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`	`}`
`@@ -244,7 +244,7 @@ Object write(TruffleObject receiver, Object key, Object value,`
`244`	`244`	`try {`
`245`	`245`	`return ForeignAccess.sendWrite(writeNode, receiver, key, value);`
`246`	`246`	`} catch (UnknownIdentifierException \| UnsupportedMessageException \| UnsupportedTypeException e) {`
`247`		`- throw raise(PythonErrorType.AttributeError, e.getMessage());`
	`247`	`+ throw raise(PythonErrorType.AttributeError, e);`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`}`
`@@ -259,7 +259,7 @@ Object remove(TruffleObject receiver, Object key,`
`259`	`259`	`try {`
`260`	`260`	`return ForeignAccess.sendRemove(removeNode, receiver, key);`
`261`	`261`	`} catch (UnknownIdentifierException \| UnsupportedMessageException e) {`
`262`		`- throw raise(PythonErrorType.AttributeError, e.getMessage());`
	`262`	`+ throw raise(PythonErrorType.AttributeError, e);`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`	`}`
`@@ -274,7 +274,7 @@ Object remove(TruffleObject receiver, Object[] arguments,`
`274`	`274`	`try {`
`275`	`275`	`return ForeignAccess.sendExecute(executeNode, receiver, arguments);`
`276`	`276`	`} catch (UnsupportedMessageException \| UnsupportedTypeException \| ArityException e) {`
`277`		`- throw raise(PythonErrorType.AttributeError, e.getMessage());`
	`277`	`+ throw raise(PythonErrorType.AttributeError, e);`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`	`}`
`@@ -289,7 +289,7 @@ Object remove(TruffleObject receiver, Object[] arguments,`
`289`	`289`	`try {`
`290`	`290`	`return ForeignAccess.sendNew(executeNode, receiver, arguments);`
`291`	`291`	`} catch (UnsupportedMessageException \| UnsupportedTypeException \| ArityException e) {`
`292`		`- throw raise(PythonErrorType.AttributeError, e.getMessage());`
	`292`	`+ throw raise(PythonErrorType.AttributeError, e);`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`	`}`
`@@ -304,7 +304,7 @@ Object remove(TruffleObject receiver, String key, Object[] arguments,`
`304`	`304`	`try {`
`305`	`305`	`return ForeignAccess.sendInvoke(executeNode, receiver, key, arguments);`
`306`	`306`	`} catch (UnsupportedMessageException \| UnsupportedTypeException \| ArityException \| UnknownIdentifierException e) {`
`307`		`- throw raise(PythonErrorType.AttributeError, e.getMessage());`
	`307`	`+ throw raise(PythonErrorType.AttributeError, e);`
`308`	`308`	`}`
`309`	`309`	`}`
`310`	`310`	`}`
`@@ -346,7 +346,7 @@ Object remove(TruffleObject receiver,`
`346`	`346`	`try {`
`347`	`347`	`return ForeignAccess.sendGetSize(executeNode, receiver);`
`348`	`348`	`} catch (UnsupportedMessageException e) {`
`349`		`- throw raise(PythonErrorType.TypeError, e.getMessage());`
	`349`	`+ throw raise(PythonErrorType.TypeError, e);`
`350`	`350`	`}`
`351`	`351`	`}`
`352`	`352`	`}`
`@@ -399,7 +399,7 @@ TruffleObject remove(TruffleObject receiver,`
`399`	`399`	`try {`
`400`	`400`	`return ForeignAccess.sendKeys(executeNode, receiver);`
`401`	`401`	`} catch (UnsupportedMessageException e) {`
`402`		`- throw raise(PythonErrorType.TypeError, e.getMessage());`
	`402`	`+ throw raise(PythonErrorType.TypeError, e);`
`403`	`403`	`}`
`404`	`404`	`}`
`405`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ Object open(String pathname, int flags, int fileMode, @SuppressWarnings("unused"`
`587`	`587`	`return getResources().open(truffleFile, fc);`
`588`	`588`	`} catch (IOException e) {`
`589`	`589`	`gotException.enter();`
`590`		`- throw raise(OSError, e.getMessage());`
	`590`	`+ throw raise(OSError, e);`
`591`	`591`	`}`
`592`	`592`	`}`
`593`	`593`
`@@ -659,7 +659,7 @@ Object lseek(int fd, long pos, int how,`
`659`	`659`	`return setPosition(pos, how, fc);`
`660`	`660`	`} catch (IOException e) {`
`661`	`661`	`gotException.enter();`
`662`		`- throw raise(OSError, e.getMessage());`
	`662`	`+ throw raise(OSError, e);`
`663`	`663`	`}`
`664`	`664`	`}`
`665`	`665`
`@@ -699,7 +699,7 @@ Object close(int fd,`
`699`	`699`	`closeChannel(channel);`
`700`	`700`	`} catch (IOException e) {`
`701`	`701`	`gotException.enter();`
`702`		`- throw raise(OSError, e.getMessage());`
	`702`	`+ throw raise(OSError, e);`
`703`	`703`	`}`
`704`	`704`	`}`
`705`	`705`	`return PNone.NONE;`
`@@ -723,7 +723,7 @@ Object unlink(String path) {`
`723`	`723`	`getContext().getEnv().getTruffleFile(path).delete();`
`724`	`724`	`} catch (RuntimeException \| IOException e) {`
`725`	`725`	`gotException.enter();`
`726`		`- throw raise(OSError, e.getMessage());`
	`726`	`+ throw raise(OSError, e);`
`727`	`727`	`}`
`728`	`728`	`return PNone.NONE;`
`729`	`729`	`}`
`@@ -756,7 +756,7 @@ Object mkdir(String path, @SuppressWarnings("unused") int mode, @SuppressWarning`
`756`	`756`	`getContext().getEnv().getTruffleFile(path).createDirectory();`
`757`	`757`	`} catch (RuntimeException \| IOException e) {`
`758`	`758`	`gotException.enter();`
`759`		`- throw raise(OSError, e.getMessage());`
	`759`	`+ throw raise(OSError, e);`
`760`	`760`	`}`
`761`	`761`	`return PNone.NONE;`
`762`	`762`	`}`
`@@ -781,7 +781,7 @@ Object write(int fd, byte[] data,`
`781`	`781`	`return doWriteOp(data, (WritableByteChannel) channel);`
`782`	`782`	`} catch (NonWritableChannelException \| IOException e) {`
`783`	`783`	`gotException.enter();`
`784`		`- throw raise(OSError, e.getMessage());`
	`784`	`+ throw raise(OSError, e);`
`785`	`785`	`}`
`786`	`786`	`} else {`
`787`	`787`	`notWritable.enter();`
`@@ -849,7 +849,7 @@ ByteSequenceStorage readSeekable(SeekableByteChannel channel, int size) {`
`849`	`849`	`availableSize = availableSize(channel);`
`850`	`850`	`} catch (IOException e) {`
`851`	`851`	`gotException.enter();`
`852`		`- throw raise(OSError, e.getMessage());`
	`852`	`+ throw raise(OSError, e);`
`853`	`853`	`}`
`854`	`854`	`if (availableSize > ReadNode.MAX_READ) {`
`855`	`855`	`availableSize = ReadNode.MAX_READ;`
`@@ -902,7 +902,7 @@ private int readIntoBuffer(ReadableByteChannel readableChannel, ByteBuffer dst)`
`902`	`902`	`return readableChannel.read(dst);`
`903`	`903`	`} catch (IOException e) {`
`904`	`904`	`gotException.enter();`
`905`		`- throw raise(OSError, e.getMessage());`
	`905`	`+ throw raise(OSError, e);`
`906`	`906`	`}`
`907`	`907`	`}`
`908`	`908`
`@@ -1003,7 +1003,7 @@ Object chmod(String path, int mode, @SuppressWarnings("unused") PNone dir_fd, @S`
`1003`	`1003`	`truffleFile.setPosixPermissions(permissions);`
`1004`	`1004`	`} catch (IOException e) {`
`1005`	`1005`	`gotException.enter();`
`1006`		`- throw raise(OSError, e.getMessage());`
	`1006`	`+ throw raise(OSError, e);`
`1007`	`1007`	`}`
`1008`	`1008`	`return PNone.NONE;`
`1009`	`1009`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ PNone setCompleter(PythonModule self, String path,`
`258`	`258`	`}`
`259`	`259`	`reader.close();`
`260`	`260`	`} catch (IOException e) {`
`261`		`- throw raise(PythonErrorType.IOError, e.getMessage());`
	`261`	`+ throw raise(PythonErrorType.IOError, e);`
`262`	`262`	`}`
`263`	`263`	`return PNone.NONE;`
`264`	`264`	`}`
`@@ -286,7 +286,7 @@ PNone setCompleter(PythonModule self, String path,`
`286`	`286`	`}`
`287`	`287`	`writer.close();`
`288`	`288`	`} catch (IOException e) {`
`289`		`- throw raise(PythonErrorType.IOError, e.getMessage());`
	`289`	`+ throw raise(PythonErrorType.IOError, e);`
`290`	`290`	`}`
`291`	`291`	`return PNone.NONE;`
`292`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public Object doForeignObjectSlice(TruffleObject object, PSlice idxSlice,`
`121`	`121`	`mslice = materializeSlice(idxSlice, object, getSizeNode, foreign2PTypeNode);`
`122`	`122`	`} catch (InteropException e) {`
`123`	`123`	`CompilerDirectives.transferToInterpreter();`
`124`		`- throw raise(RuntimeError, e.getMessage());`
	`124`	`+ throw raise(RuntimeError, e);`
`125`	`125`	`}`
`126`	`126`	`Object[] values = new Object[mslice.length];`
`127`	`127`	`for (int i = mslice.start, j = 0; i < mslice.stop; i += mslice.step, j++) {`
`@@ -225,7 +225,7 @@ public Object doForeignObjectSlice(TruffleObject object, PSlice idxSlice, PSeque`
`225`	`225`	`return PNone.NONE;`
`226`	`226`	`} catch (InteropException e) {`
`227`	`227`	`CompilerDirectives.transferToInterpreter();`
`228`		`- throw raise(RuntimeError, e.getMessage());`
	`228`	`+ throw raise(RuntimeError, e);`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`
`@@ -243,7 +243,7 @@ public Object doForeignObject(TruffleObject object, Object idx, Object value,`
`243`	`243`	`return writeForeignValue(object, convertedIdx, convertedValue, foreignWrite, keyInfoNode, hasSizeNode, foreign2PTypeNode);`
`244`	`244`	`} catch (InteropException e) {`
`245`	`245`	`CompilerDirectives.transferToInterpreter();`
`246`		`- throw raise(RuntimeError, e.getMessage());`
	`246`	`+ throw raise(RuntimeError, e);`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`
`@@ -283,7 +283,7 @@ public Object doForeignObjectSlice(TruffleObject object, PSlice idxSlice,`
`283`	`283`	`return PNone.NONE;`
`284`	`284`	`} catch (InteropException e) {`
`285`	`285`	`CompilerDirectives.transferToInterpreter();`
`286`		`- throw raise(RuntimeError, e.getMessage());`
	`286`	`+ throw raise(RuntimeError, e);`
`287`	`287`	`}`
`288`	`288`	`}`
`289`	`289`
`@@ -298,7 +298,7 @@ public Object doForeignObject(TruffleObject object, Object idx,`
`298`	`298`	`return removeForeignValue(object, convertedIdx, foreignRemove, keyInfoNode, hasSizeNode);`
`299`	`299`	`} catch (InteropException e) {`
`300`	`300`	`CompilerDirectives.transferToInterpreter();`
`301`		`- throw raise(RuntimeError, e.getMessage());`
	`301`	`+ throw raise(RuntimeError, e);`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
Original file line number	Diff line number	Diff line change
`@@ -1242,7 +1242,7 @@ private Object encodeString(String self, String encoding, String errors) {`
`1242`	`1242`	`} catch (IllegalArgumentException e) {`
`1243`	`1243`	`throw raise(LookupError, "unknown encoding: %s", encoding);`
`1244`	`1244`	`} catch (CharacterCodingException e) {`
`1245`		`- throw raise(UnicodeEncodeError, "%s", e.getMessage());`
	`1245`	`+ throw raise(UnicodeEncodeError, e);`
`1246`	`1246`	`}`
`1247`	`1247`	`}`
`1248`	`1248`	`}`