Change key type

Guardsquare · Jul 28, 2022 · f4308f9 · f4308f9
1 parent d6d1221
commit f4308f9
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/base/src/main/java/proguard/backport/LambdaExpressionConverter.java b/base/src/main/java/proguard/backport/LambdaExpressionConverter.java
@@ -60,8 +60,8 @@ public class LambdaExpressionConverter
     private final ClassVisitor                   extraClassVisitor;
 
     private final Map<InvokeDynamicConstant, LambdaExpression> lambdaExpressionMap;
-    private final CodeAttributeEditor            codeAttributeEditor;
-    private final MemberRemover                  memberRemover;
+    private final CodeAttributeEditor                          codeAttributeEditor;
+    private final MemberRemover                                memberRemover;
 
 
     public LambdaExpressionConverter(ClassPool             programClassPool,
@@ -74,7 +74,7 @@ public LambdaExpressionConverter(ClassPool             programClassPool,
         this.extraDataEntryNameMap = extraDataEntryNameMap;
         this.extraClassVisitor     = extraClassVisitor;
 
-        this.lambdaExpressionMap  = new HashMap<InvokeDynamicConstant, LambdaExpression>();
+        this.lambdaExpressionMap  = new HashMap<>();
         this.codeAttributeEditor  = new CodeAttributeEditor(true, true);
         this.memberRemover        = new MemberRemover();
     }
@@ -171,10 +171,9 @@ public void visitConstantInstruction(Clazz clazz, Method method, CodeAttribute c
             InvokeDynamicConstant invokeDynamicConstant =
                 (InvokeDynamicConstant) programClass.getConstant(constantInstruction.constantIndex);
 
-            int bootstrapMethodIndex = invokeDynamicConstant.getBootstrapMethodAttributeIndex();
-            if (lambdaExpressionMap.containsKey(bootstrapMethodIndex))
+            if (lambdaExpressionMap.containsKey(invokeDynamicConstant))
             {
-                LambdaExpression lambdaExpression = lambdaExpressionMap.get(bootstrapMethodIndex);
+                LambdaExpression lambdaExpression = lambdaExpressionMap.get(invokeDynamicConstant);
                 String lambdaClassName = lambdaExpression.getLambdaClassName();
 
                 InstructionSequenceBuilder builder =