Fix null CallbackInfo(Returnable) when handler is static and target is not #179
Conversation
This file contains hidden or 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
haykam821
reviewed
Aug 1, 2025
src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java
Outdated
Show resolved
Hide resolved
|
oh hey, it failed check style |
Chocohead
suggested changes
Aug 4, 2025
| @@ -217,7 +217,7 @@ private class Callback extends InsnList { | |||
| this.invoke.add().add(handlerArgs); | |||
|
|
|||
| //If the handler doesn't captureArgs, the CallbackInfo(Returnable) will be the first LVT slot, otherwise it will be at the target's frameSize | |||
| int callbackInfoSlot = handlerArgs.length == 1 ? Bytecode.isStatic(handler) ? 0 : 1 : frameSize; | |||
| int callbackInfoSlot = Bytecode.getFirstNonArgLocalIndex(handler) - 1; | |||
There was a problem hiding this comment.
This won't work when extraArgs > 0, you'd need to subtract Bytecode.getArgsSize(handlerArgs, target.arguments.length + 1, handlerArgs.length) to account for the captured locals following the callback.
There was a problem hiding this comment.
I had thought about M.E. locals, but didn't really consider LocalCapture
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.
Fixes #178