support constructor references

ReadyTalk · Jul 9, 2017 · 24b9501 · 24b9501
1 parent a329416
commit 24b9501
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/classpath/java/lang/invoke/LambdaMetafactory.java b/classpath/java/lang/invoke/LambdaMetafactory.java
@@ -278,7 +278,7 @@ private static byte[] makeInvocationCode(List<PoolEntry> pool,
   {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     write2(out, fieldType.footprint()
-           + localType.footprint() + 2); // max stack
+           + localType.footprint() + 3); // max stack
     write2(out, localType.footprint() + 1); // max locals
     write4(out, 0); // length (we'll set the real value later)
 
@@ -326,6 +326,18 @@ private static byte[] makeInvocationCode(List<PoolEntry> pool,
       writeMethodReference(out, pool, implementation.method);
       break;
 
+    case MethodHandle.REF_newInvokeSpecial:
+      write1(out, new_);
+      write2(out, ConstantPool.addClass
+             (pool,
+              Classes.makeString
+              (implementation.method.class_.name, 0,
+               implementation.method.class_.name.length - 1)) + 1);
+      write1(out, dup);
+      write1(out, invokespecial);
+      writeMethodReference(out, pool, implementation.method);
+      break;
+
     case MethodHandle.REF_invokeInterface:
       write1(out, invokeinterface);
       writeInterfaceMethodReference(out, pool, implementation.method);
@@ -337,7 +349,9 @@ private static byte[] makeInvocationCode(List<PoolEntry> pool,
         ("todo: implement '" + implementation.kind + "' per http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-5.html#jvms-5.4.3.5");
     }
 
-    maybeBoxOrUnbox(out, pool, implementation.type().result(), localType.result());
+    if (implementation.kind != MethodHandle.REF_newInvokeSpecial) {
+      maybeBoxOrUnbox(out, pool, implementation.type().result(), localType.result());
+    }
     write1(out, localType.result().return_());
 
     write2(out, 0); // exception handler table length

diff --git a/classpath/java/lang/invoke/MethodHandle.java b/classpath/java/lang/invoke/MethodHandle.java
@@ -17,6 +17,7 @@ public class MethodHandle {
   static final int REF_invokeVirtual = 5;
   static final int REF_invokeStatic = 6;
   static final int REF_invokeSpecial = 7;
+  static final int REF_newInvokeSpecial = 8;
   static final int REF_invokeInterface = 9;
 
   final int kind;

diff --git a/test/InvokeDynamic.java b/test/InvokeDynamic.java
@@ -176,5 +176,9 @@ private void test() {
     { Unboxed s = InvokeDynamic::addBoxed;
       expect(s.add(1, 2) == 3);
     }
+
+    { Supplier<java.util.List<String>> s = java.util.ArrayList<String>::new;
+      java.util.List<String> list = s.get();
+    }
   }
 }