Skip to content

Commit

Permalink
Adjust SoftMethodParamsPatch conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
@Su5eD
Su5eD committed Apr 28, 2024
1 parent f8d3664 commit d3d95f0
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 19 deletions.
17 changes: 13 additions & 4 deletions definition/src/main/java/org/sinytra/adapter/patch/transformer/SoftMethodParamsPatch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.sinytra.adapter.patch.analysis.params.ParametersDiff;
import org.sinytra.adapter.patch.api.*;
import org.sinytra.adapter.patch.fixes.BytecodeFixerUpper;
import org.sinytra.adapter.patch.serialization.MethodTransformSerialization;
import org.sinytra.adapter.patch.transformer.param.TransformParameters;
import org.sinytra.adapter.patch.util.AdapterUtil;
import org.sinytra.adapter.patch.util.MethodQualifier;
Expand All @@ -17,9 +18,10 @@
import java.util.List;
import java.util.Set;

public record SoftMethodParamsPatch(String replacementTarget) implements MethodTransform {
public record SoftMethodParamsPatch(String replacementTarget, MethodTransform targetTransform) implements MethodTransform {
public static final Codec<SoftMethodParamsPatch> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.STRING.fieldOf("replacementTarget").forGetter(SoftMethodParamsPatch::replacementTarget)
Codec.STRING.fieldOf("replacementTarget").forGetter(SoftMethodParamsPatch::replacementTarget),
MethodTransformSerialization.METHOD_TRANSFORM_CODEC.fieldOf("targetTransform").forGetter(SoftMethodParamsPatch::targetTransform)
).apply(instance, SoftMethodParamsPatch::new));

@Override
Expand All @@ -34,17 +36,24 @@ public Collection<String> getAcceptedAnnotations() {

@Override
public Patch.Result apply(ClassNode classNode, MethodNode methodNode, MethodContext methodContext, PatchContext context) {
Patch.Result result = Patch.Result.PASS;
MethodQualifier targetQualifier = methodContext.getTargetMethodQualifier();
if (targetQualifier != null) {
// In the case of constructor TAIL injection, it's safer to keep working with the original values
if (targetQualifier.name().equals("<init>") && !methodContext.capturesLocals() && methodContext.injectionPointAnnotation().<String>getValue("value").map(s -> s.get().equals("TAIL")).orElse(false)) {
return Patch.Result.PASS;
}

List<Pair<Integer, Type>> replacements = determineAutomaticReplacements(targetQualifier, methodNode, context, this.replacementTarget);
if (!replacements.isEmpty()) {
TransformParameters patch = TransformParameters.builder()
.replacements(replacements)
.build();
return Patch.Result.APPLY.or(patch.apply(classNode, methodNode, methodContext, context));
result = Patch.Result.APPLY.or(patch.apply(classNode, methodNode, methodContext, context));
}
}
return Patch.Result.PASS;
// Modify the method target
return result.or(this.targetTransform.apply(classNode, methodNode, methodContext, context));
}

private List<Pair<Integer, Type>> determineAutomaticReplacements(MethodQualifier targetQualifier, MethodNode methodNode, PatchContext context, String replacement) {
Expand Down
15 changes: 7 additions & 8 deletions plugin/src/main/java/org/sinytra/adapter/gradle/ClassAnalyzer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,13 +304,13 @@ private void findOverloadedMethods(AnalysisContext context, Map<? super String,
if (overloader.isFullMatch()) {
this.trace.logHeader();
LOGGER.info("OVERLOAD");
LOGGER.info(" " + overloaderQualifier);
LOGGER.info("=> " + dirtyQualifier);
LOGGER.info(" {}", overloaderQualifier);
LOGGER.info("=> {}", dirtyQualifier);
LOGGER.info("===");
PatchInstance patch = Patch.builder()
.targetClass(this.dirtyNode.name)
.targetMethod(overloaderQualifier)
.chain(b -> overloader.applyPatchTargetModifier(b, method))
.transform(overloader.getPatchTargetTransform(method))
.transformMethods(diff.createTransforms(ParamTransformTarget.METHOD))
.build();
context.addPatch(patch);
Expand All @@ -320,15 +320,14 @@ private void findOverloadedMethods(AnalysisContext context, Map<? super String,
} else if (diff.insertions().isEmpty()) {
this.trace.logHeader();
LOGGER.info("SOFT OVERLOAD");
LOGGER.info(" " + overloaderQualifier);
LOGGER.info("=> " + dirtyQualifier);
LOGGER.info(" {}", overloaderQualifier);
LOGGER.info("=> {}", dirtyQualifier);
LOGGER.info("===");
PatchInstance patch = Patch.builder()
.targetClass(this.dirtyNode.name)
.targetMethod(overloaderQualifier)
.transform(new SoftMethodParamsPatch(method.name + method.desc))
// IMPORTANT: Target modification must come AFTER soft params patch
.chain(b -> overloader.applyPatchTargetModifier(b, method))
// IMPORTANT: Target modification must be applied AFTER soft params patch
.transform(new SoftMethodParamsPatch(method.name + method.desc, overloader.getPatchTargetTransform(method)))
.build();
context.addPatch(patch);
}
Expand Down
12 changes: 5 additions & 7 deletions plugin/src/main/java/org/sinytra/adapter/gradle/analysis/OverloadedMethods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.mojang.datafixers.util.Pair;
import org.sinytra.adapter.gradle.util.MatchResult;
import org.sinytra.adapter.patch.analysis.MethodCallAnalyzer;
import org.sinytra.adapter.patch.api.Patch;
import org.sinytra.adapter.patch.api.MethodTransform;
import org.sinytra.adapter.patch.transformer.ModifyInjectionTarget;
import org.sinytra.adapter.patch.transformer.filter.InjectionPointTransformerFilter;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -140,12 +140,10 @@ public static MatchResult checkParameters(Type[] parameterTypes, Type[] dirtyPar
}

public record MethodOverload(boolean isFullMatch, MethodNode methodNode, List<String> excludedInjectionPoints) {
public void applyPatchTargetModifier(Patch.ClassPatchBuilder builder, MethodNode method) {
if (this.excludedInjectionPoints.isEmpty()) {
builder.modifyTarget(method.name + method.desc);
} else {
builder.transform(InjectionPointTransformerFilter.create(new ModifyInjectionTarget(List.of(method.name + method.desc)), this.excludedInjectionPoints));
}
public MethodTransform getPatchTargetTransform(MethodNode method) {
return this.excludedInjectionPoints.isEmpty()
? new ModifyInjectionTarget(List.of(method.name + method.desc))
: InjectionPointTransformerFilter.create(new ModifyInjectionTarget(List.of(method.name + method.desc)), this.excludedInjectionPoints);
}
}
}

0 comments on commit d3d95f0

Please sign in to comment.