From 4931fc19071da1334f0110199c3eed282744ac56 Mon Sep 17 00:00:00 2001 From: Yanbing Zhao Date: Thu, 15 Nov 2018 13:39:30 +0800 Subject: [PATCH] Only remove synthetic lambda methods referenced in body of SideOnly methods (#5127) --- .../fml/common/asm/transformers/SideTransformer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java index b8483dbb66..ada460b275 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/SideTransformer.java @@ -92,14 +92,16 @@ public class SideTransformer implements IClassTransformer } } - // remove dynamic lambda methods that are inside of removed methods - List dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles(); - if (!dynamicLambdaHandles.isEmpty()) + // remove dynamic synthetic lambda methods that are inside of removed methods + for (List dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles(); + !dynamicLambdaHandles.isEmpty(); dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles()) { + lambdaGatherer = new LambdaGatherer(); methods = classNode.methods.iterator(); while (methods.hasNext()) { MethodNode method = methods.next(); + if ((method.access & Opcodes.ACC_SYNTHETIC) == 0) continue; for (Handle dynamicLambdaHandle : dynamicLambdaHandles) { if (method.name.equals(dynamicLambdaHandle.getName()) && method.desc.equals(dynamicLambdaHandle.getDesc())) @@ -109,6 +111,7 @@ public class SideTransformer implements IClassTransformer System.out.println(String.format("Removing Method: %s.%s%s", classNode.name, method.name, method.desc)); } methods.remove(); + lambdaGatherer.accept(method); } } }