Skip to content
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.

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

Look for the correct trapContext in case it is not. #21

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/MethodProxies/MpMethodProxy.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,15 @@ MpMethodProxy >> install [
During the meta-jump call the handler to tell there was an unwind."
thisProcess shiftLevelUp.
trapContext := thisContext findNextUnwindContextUpTo: nil.

[ "Look for the correct context in case it is not..."
trapContext ifNil: [ "Nothing to do here"
'Abort method proxy' traceCr.
^ nil
].
trapContext hasTemporaryVariableNamed: 'wasMeta'.
] whileFalse: [ trapContext := trapContext sender ].

wasMeta := trapContext tempNamed: 'wasMeta'.
handler
aboutToReturnWithReceiver: trapContext receiver
Expand Down