Skip to content

Fix interpreter hang on nested function errors#2095

Merged
KCarretto merged 1 commit intomainfrom
fix-eldritch-hang-error-handling-13055281351496593596
Mar 23, 2026
Merged

Fix interpreter hang on nested function errors#2095
KCarretto merged 1 commit intomainfrom
fix-eldritch-hang-error-handling-13055281351496593596

Conversation

@KCarretto
Copy link
Collaborator

Fixes a bug where errors in nested functions or comprehensions corrupt the interpreter's environment state, potentially leading to an infinite hang/deadlock. The fix guarantees environment restoration before error propagation.


PR created automatically by Jules for task 13055281351496593596 started by @KCarretto

Fixed an issue where the `eldritch` interpreter could hang indefinitely or deadlock when an error occurred within a nested function or comprehension.

The issue was caused by the `?` operator returning early on an error during `execute_stmts` or `evaluate`. This early return skipped the cleanup code that restored `interp.env` and `interp.flow` to their original states. As a result, the interpreter's environment pointer was left pointing to the inner function's environment, creating a cyclical reference (`Arc` cycle) between the inner function and the environment holding it, which corrupted the interpreter state.

The fix safely captures the `Result` of execution, restores the environment and flow state to their original values, and then propagates the error.

Added a test (`test_hang_deadlock`) to ensure this issue doesn't recur.

Co-authored-by: KCarretto <16250309+KCarretto@users.noreply.github.com>
@google-labs-jules
Copy link
Contributor

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

@github-actions
Copy link
Contributor

Summary

Tests 📝 Passed ✅ Failed ❌ Skipped ⏭️ Other ❓ Flaky 🍂 Duration ⏱️
2823    ±0 2823    ±0 0    ±0 0    ±0 0    ±0 0    ±0 1ms    ±0

Previous Results

Build 🏗️ Result 🧪 Tests 📝 Passed ✅ Failed ❌ Skipped ⏭️ Other ❓ Flaky 🍂 Duration ⏱️
#1748 2823 2823 0 0 0 0 38.7s

Insights

Average Tests per Run Total Flaky Tests Total Failed Slowest Test (p95)
2823 0 0 5.5s

Slowest Tests

Test 📝 Results 📊 Duration (avg) ⏱️ Duration (p95) ⏱️
TestDockerExecutor_Build_ContextCancellation 1 5.5s 5.5s
eldritch-libsys: std::dll_inject_impl::tests::test_dll_inject_simple 1 5.1s 5.1s
TestInteractiveShell 1 5.1s 5.1s
TestOtherStreamOutput 1 5.0s 5.0s
imix::bin/imix: install::tests::test_install_execution 3 1.8s 4.9s
imix::bin/imix: install::tests::test_install_execution 3 1.8s 4.9s
imix::bin/imix: install::tests::test_install_execution 3 1.8s 4.9s
imix::bin/imix: tests::task_tests::test_task_eprint_behavior 3 3.0s 3.0s
imix::bin/imix: tests::task_tests::test_task_streaming_error 3 3.0s 3.0s
imix::bin/imix: tests::task_tests::test_task_streaming_output 3 3.0s 3.0s

🎉 No failed tests in this run. | 🍂 No flaky tests in this run.

Github Test Reporter by CTRF 💚

@KCarretto KCarretto marked this pull request as ready for review March 16, 2026 05:09
@KCarretto KCarretto requested review from Cictrone and hulto March 16, 2026 05:09
@KCarretto KCarretto enabled auto-merge March 16, 2026 05:09
@KCarretto KCarretto added this pull request to the merge queue Mar 23, 2026
Merged via the queue into main with commit 28b83c5 Mar 23, 2026
9 checks passed
@KCarretto KCarretto deleted the fix-eldritch-hang-error-handling-13055281351496593596 branch March 23, 2026 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants