Fixing issue with vmindex not being properly updated.

2 files changed, 163 insertions, 2 deletions

diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleSwapMethodsTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleSwapMethodsTest.java
new file mode 100644
index 00000000..de476ffc
--- /dev/null
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleSwapMethodsTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.github.dcevm.test.methods;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test for moving method around with MethodHandle pointing to it. vmindex in the MethodHandle should be updated by DCEVM.
+ *
+ * @author Ivan Dubrov
+ */
+public class MethodHandleSwapMethodsTest {
+
+  // Version 0
+  public static class A {
+    public int method() {
+      return 1;
+    }
+
+    public int method2() {
+      return 10;
+    }
+  }
+
+  // Version 1
+  public static class A___1 {
+    public int method0() {
+      return 20;
+    }
+
+    public int method2() {
+      return 30;
+    }
+
+    public int method() {
+      return 2;
+    }
+
+    public int method3() {
+      return 40;
+    }
+  }
+
+  @Before
+  public void setUp() throws Exception {
+    __toVersion__(0);
+  }
+
+  @Test
+  public void testMethodHandleUpdated() throws Throwable {
+
+    assert __version__() == 0;
+
+    MethodHandles.Lookup lookup = MethodHandles.lookup();
+    MethodHandle handle = lookup.findVirtual(A.class, "method", MethodType.methodType(int.class));
+
+    A a = new A();
+    assertEquals(1, (int) handle.invokeExact(a));
+
+    __toVersion__(1);
+
+    assertEquals(2, (int) handle.invokeExact(a));
+
+    __toVersion__(0);
+    assert __version__() == 0;
+  }
+}
\ No newline at end of file
diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleTest.java
index 0d0a86e7..1efbf0d3 100644
--- a/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodHandleTest.java
@@ -37,6 +37,9 @@ import static org.junit.Assert.assertEquals;
 /**
  * Test for replacing method with MethodHandle pointing to it.
  *
+ * FIXME: add tests for case when we change type of the method (like static -> non-static). If that happens,
+ * MemberName should be somehow marked as invalid...
+ *
  * @author Ivan Dubrov
  */
 public class MethodHandleTest {
@@ -47,9 +50,17 @@ public class MethodHandleTest {
       return 1;
     }
 
+    public int filter(int value) {
+      return value + 10;
+    }
+
     public static int staticMethod() {
       return 3;
     }
+
+    public static int staticFilter(int value) {
+      return value + 1000;
+    }
   }
 
   // Version 1
@@ -58,9 +69,17 @@ public class MethodHandleTest {
       return 2;
     }
 
+    public int filter(int value) {
+      return value + 100;
+    }
+
     public static int staticMethod() {
       return 4;
     }
+
+    public static int staticFilter(int value) {
+      return value + 10000;
+    }
   }
 
   @Before
@@ -77,11 +96,31 @@ public class MethodHandleTest {
     MethodHandle handle = lookup.findVirtual(A.class, "method", MethodType.methodType(int.class));
 
     A a = new A();
-    assertEquals(1, handle.invoke(a));
+    assertEquals(1, (int) handle.invokeExact(a));
+
+    __toVersion__(1);
+
+    assertEquals(2, (int) handle.invokeExact(a));
+
+    __toVersion__(0);
+    assert __version__() == 0;
+  }
+
+  @Test
+  public void testBoundMethodHandleUpdated() throws Throwable {
+
+    assert __version__() == 0;
+
+    MethodHandles.Lookup lookup = MethodHandles.lookup();
+    MethodHandle handle = lookup.findVirtual(A.class, "method", MethodType.methodType(int.class));
+
+    A a = new A();
+    MethodHandle boundHandle = handle.bindTo(a);
+    assertEquals(1, (int) boundHandle.invokeExact());
 
     __toVersion__(1);
 
-    assertEquals(2, handle.invoke(a));
+    assertEquals(2, (int) boundHandle.invokeExact());
 
     __toVersion__(0);
     assert __version__() == 0;
@@ -105,4 +144,29 @@ public class MethodHandleTest {
     assert __version__() == 0;
   }
 
+  @Test
+  public void testComplexMethodHandleUpdated() throws Throwable {
+
+    assert __version__() == 0;
+
+    MethodHandles.Lookup lookup = MethodHandles.lookup();
+    MethodHandle handle = lookup.findVirtual(A.class, "method", MethodType.methodType(int.class));
+    MethodHandle filter = lookup.findVirtual(A.class, "filter", MethodType.methodType(int.class, int.class));
+    MethodHandle staticFilter = lookup.findStatic(A.class, "staticFilter", MethodType.methodType(int.class, int.class));
+
+    A a = new A();
+    MethodHandle boundFilter = filter.bindTo(a);
+    handle = MethodHandles.filterReturnValue(handle, staticFilter);
+    handle = MethodHandles.filterReturnValue(handle, boundFilter);
+
+    assertEquals(1011, handle.invoke(a));
+
+    __toVersion__(1);
+
+    assertEquals(10102, handle.invoke(a));
+
+    __toVersion__(0);
+    assert __version__() == 0;
+  }
+
 }
\ No newline at end of file