Skip to content

[GR-72856] Preserve exception context on bare reraises. #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graalvmbot merged 1 commit into from
Apr 24, 2026
Merged

[GR-72856] Preserve exception context on bare reraises. #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_contextlib.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ test.test_contextlib.TestExitStack.test_dont_reraise_RuntimeError @ darwin-arm64
test.test_contextlib.TestExitStack.test_enter_context @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_enter_context_errors @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_excessive_nesting @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_exit_exception_chaining @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_exit_exception_chaining_reference @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_exit_exception_chaining_suppress @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_exit_exception_explicit_none_context @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_exit_exception_non_suppressing @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_exit_exception_traceback @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_contextlib.TestExitStack.test_exit_exception_with_correct_context @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
Expand Down
3 changes: 3 additions & 0 deletions ...com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3453,6 +3453,9 @@ private void chainPythonExceptions(VirtualFrame virtualFrame, MutableLoopData mu
}

private void chainPythonExceptions(PException current, PException context) {
if (current.isReraised()) {
return;
}
if (chainExceptionsNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
chainExceptionsNode = insert(ChainExceptionsNode.create());
Expand Down
2 changes: 1 addition & 1 deletion ...cle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ public AbstractTruffleException interceptTruffleException(AbstractTruffleExcepti
getCaughtExceptionNode = insert(ExceptionStateNodes.GetCaughtExceptionNode.create());
}
AbstractTruffleException context = getCaughtExceptionNode.execute(frame);
if (context instanceof PException pe2) {
if (context instanceof PException pe2 && !pe.isReraised()) {
if (chainExceptionsNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
chainExceptionsNode = insert(ChainExceptionsNode.create());
Expand Down
6 changes: 6 additions & 0 deletions ...hon/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public final class PException extends AbstractTruffleException {
private int catchBci;
private boolean reified = false;
private boolean skipFirstTracebackFrame;
private boolean reraised;

// See the docs of MaterializeLazyTracebackNode
private int tracebackFrameCount;
Expand Down Expand Up @@ -436,6 +437,7 @@ public void notifyAddedTracebackFrame(boolean visible) {
public PException getExceptionForReraise(boolean rootNodeVisible) {
ensureReified();
PException pe = PException.fromObject(pythonException, getLocation(), false);
pe.reraised = true;
if (pe.getUnreifiedException() instanceof PBaseExceptionGroup grp) {
grp.setContainsReraises(true);
}
Expand Down Expand Up @@ -603,6 +605,10 @@ public void dontTraceOnReraise() {
shouldTrace = true;
}

public boolean isReraised() {
return reraised;
}

@TruffleBoundary
public static PException raiseUnboundLocalException(BytecodeNode bytecodeNode, LocalVariable localVariable) {
Object info = localVariable.getInfo();
Expand Down
Loading