Skip to content

Fix ResolverSyntheticInstanceof incorrectly converting non-boolean ModifyExpressionValue to ModifyInstanceofValue #10

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

Open
SavageVictor wants to merge 1 commit into
base: 1.21.x
Choose a base branch
from
Open

Fix ResolverSyntheticInstanceof incorrectly converting non-boolean ModifyExpressionValue to ModifyInstanceofValue #10

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
10 changes: 10 additions & 0 deletions ...src/main/java/org/sinytra/adapter/patch/resolver/special/ResolverSyntheticInstanceof.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.sinytra.adapter.patch.resolver.special;

import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.*;
import org.sinytra.adapter.patch.config.Configurations;
import org.sinytra.adapter.env.ctx.MixinContext;
Expand Down Expand Up @@ -58,6 +59,15 @@ public ResolutionResult resolve(MixinContext context, Recipe recipe) {
if (cleanMatcher.test(dirtyMatcher)) {
// ModifyExpressionValue doesn't include the original instanceof call, so we can skip comparing instructions
if (this.skipInsnComparison) {
// Only convert to @ModifyInstanceofValue if the handler returns boolean.
// If it returns a non-boolean type (e.g. Block), the mixin is modifying the
// value fed into the instanceof check, not the boolean result of it.
// Converting in that case produces an invalid (Block)Block handler where (Z)Z is expected.
Type handlerReturnType = Type.getReturnType(context.methodNode().desc);
if (!handlerReturnType.equals(Type.BOOLEAN_TYPE)) {
return ResolutionResult.pass();
}

TypeInsnNode instanceOfInsn = (TypeInsnNode) findLabelInsns(insn).stream().filter(i -> i.getOpcode() == Opcodes.INSTANCEOF).findFirst().orElse(null);
if (instanceOfInsn == null) {
return ResolutionResult.pass();
Expand Down