Remove our lambda special case.

This is now handled by upstream ASM directly.
https://gitlab.ow2.org/asm/asm/-/commit/124a45002ba09a6bf6fc6ce4a428321737f466f1

Author: LexManos

src/main/java/net/minecraftforge/renamer/internal/EnhancedClassRemapper.java

@@ -8,7 +8,6 @@
 import java.util.List;
 
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Handle;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
@@ -26,9 +25,6 @@ class EnhancedClassRemapper extends ClassRemapper {
         this.transformer = transformer;
     }
 
-    private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;", false);
-    private static final Handle ALT_META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "altMetafactory", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;", false);
-
     @Override
     public MethodVisitor visitMethod(final int access, final String mname, final String mdescriptor, final String msignature, final String[] exceptions) {
         //System.out.println("Method: " + className + '/' + mname + mdescriptor);
@@ -37,39 +33,17 @@ public MethodVisitor visitMethod(final int access, final String mname, final Str
         if (methodVisitor == null)
             return null;
 
+        // There is no bytecode storage for abstract parameters, so we store them locally in a special file fernflower can see
         if ((access & (Opcodes.ACC_ABSTRACT | Opcodes.ACC_NATIVE)) != 0)
             renameAbstract(access, mname, mdescriptor);
 
+        // We no longer have to map lambas as Upstream has now added support: https://gitlab.ow2.org/asm/asm/-/commit/124a45002ba09a6bf6fc6ce4a428321737f466f1
+        // However we still have to map local variable names
         return new MethodRemapper(methodVisitor, remapper) {
             @Override
             public void visitLocalVariable(final String pname, final String pdescriptor, final String psignature, final Label start, final Label end, final int index) {
                 super.visitLocalVariable(EnhancedClassRemapper.this.remapper.mapParameterName(className, mname, mdescriptor, index, pname), pdescriptor, psignature, start, end, index);
             }
-
-            @Override
-            public void visitInvokeDynamicInsn(final String name, final String descriptor, final Handle bootstrapMethodHandle, final Object... bootstrapMethodArguments) {
-                if (META_FACTORY.equals(bootstrapMethodHandle) || ALT_META_FACTORY.equals(bootstrapMethodHandle)) {
-                    String owner = Type.getReturnType(descriptor).getInternalName();
-                    String odesc = ((Type)bootstrapMethodArguments[0]).getDescriptor();
-                                   // First constant argument is "samMethodType - Signature and return type of method to be implemented by the function object."
-                                   // index 2 is the signature, but with generic types. Should we use that instead?
-
-                    // We can't call super, because that'd double map the name.
-                    // So we do our own mapping.
-                    Object[] remappedBootstrapMethodArguments = new Object[bootstrapMethodArguments.length];
-                    for (int i = 0; i < bootstrapMethodArguments.length; ++i) {
-                      remappedBootstrapMethodArguments[i] = remapper.mapValue(bootstrapMethodArguments[i]);
-                    }
-                    mv.visitInvokeDynamicInsn(
-                        remapper.mapMethodName(owner, name, odesc), // We change this
-                        remapper.mapMethodDesc(descriptor),
-                        (Handle) remapper.mapValue(bootstrapMethodHandle),
-                        remappedBootstrapMethodArguments);
-                    return;
-                }
-
-                super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
-            }
         };
     }