From 254c1d1531253b65f66aa99330a8a096244753ed Mon Sep 17 00:00:00 2001 From: Yanbing Zhao Date: Thu, 11 Apr 2019 18:02:34 -0400 Subject: [PATCH] Only remove synthetic lambda methods referenced in body of SideOnly methods (#5127) --- .../minecraftforge/fml/loading/RuntimeDistCleaner.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java index 71fd2b723c..f8cb738cb2 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java @@ -93,20 +93,23 @@ public class RuntimeDistCleaner implements ILaunchPluginService } } - // 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())) { LOGGER.debug(DISTXFORM,"Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc); methods.remove(); + lambdaGatherer.accept(method); changes.compareAndSet(false, true); } }