Fix stairstepping OCaml traces when exceptions are involved #280
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Xyene
force-pushed
the
fix-stairstepping
branch
from
a07bdb8
to
1093dd3
Compare
This commit fixes two bugs: * `caml_raise_exn` modifies the stack and then `ret`s into an `entertrap`, so we need to also do `entertrap` fixups on returns. * Trap callstacks would often have the symbol of the parent frame re-inferred, which would result in doubling up of that frame. We fix this by seeding the trap callstack with a synthetic frame, which we make sure to delete before outputting trace events. A more principled approach would be to have `Callstack` know about traps directly and avoid creating new `Callstack.t`s for them, but that work is deferred to someday that isn't today. Signed-off-by: Tudor Brindus <tbrindus@janestreet.com>
Xyene
force-pushed
the
fix-stairstepping
branch
from
1093dd3
to
9fc6abd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes two bugs:
caml_raise_exnmodifies the stack and thenrets into anentertrap, so we need to also doentertrapfixups on returns.Trap callstacks would often have the symbol of the parent frame re-inferred, which would result in doubling up of that frame. We fix this by seeding the trap callstack with a synthetic frame, which we make sure to delete before outputting trace events.
A more principled approach would be to have
Callstackknow about traps directly and avoid creating newCallstack.ts for them, but that work is deferred to someday that isn't today.