Fix issue when parsing method handle references

JesusFreke · Aug 26, 2019 · 4cf7ce7 · 4cf7ce7
1 parent 14dc373
commit 4cf7ce7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/baksmali/src/test/resources/InvokeCustomTest/InvokeCustom.smali b/baksmali/src/test/resources/InvokeCustomTest/InvokeCustom.smali
@@ -36,3 +36,9 @@
 
     invoke-virtual {v3, v2}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 .end method
+
+.method public static invokeCustomWithMethodHandleArgument([Ljava/lang/String;)V
+    .registers 15
+
+    invoke-custom {v0, v1}, call_site_2("doSomething", (LCustom;Ljava/lang/String;)Ljava/lang/String;, invoke-static@Lnonsense;->somemethod()V)@LBootstrapLinker;->normalLink(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/CallSite;
+.end method
diff --git a/smali/src/main/antlr/smaliTreeWalker.g b/smali/src/main/antlr/smaliTreeWalker.g
@@ -538,7 +538,7 @@ method_handle_reference returns[ImmutableMethodHandleReference methodHandle]
   };
 
 method_handle_literal returns[ImmutableMethodHandleReference value]
-  : (I_ENCODED_METHOD_HANDLE method_handle_reference) {
+  : ^(I_ENCODED_METHOD_HANDLE method_handle_reference) {
     $value = $method_handle_reference.methodHandle;
   };