--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/MethodSortingApp.java Fri May 17 08:29:55 2019 -0700
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2019, 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.
+ *
+ */
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.SynchronousQueue;
+
+public class MethodSortingApp {
+ static class HelloA {
+ String aaaa() { return "aaaa"; }
+ String bbbb() { return "bbbb"; }
+ String dddd() { return "dddd"; }
+ String eeee() { return "eeee"; }
+ String gggg() { return "gggg"; }
+ }
+
+ static class HelloA1 extends HelloA {
+ String aaaa() { return "aaa-"; }
+ String dddd() { return "ddd-"; }
+ String gggg() { return "ggg-"; }
+ }
+
+ static class HelloB {
+ String aaaa() { return "aaaa"; }
+ String cccc() { return "cccc"; }
+ String dddd() { return "dddd"; }
+ String ffff() { return "ffff"; }
+ String gggg() { return "gggg"; }
+ }
+
+ static class HelloB1 extends HelloB {
+ String aaaa() { return "aaa-"; }
+ String dddd() { return "ddd-"; }
+ String gggg() { return "ggg-"; }
+ }
+
+ // Default methods in interfaces must be sorted
+ static interface InterfaceA {
+ default public String aaa() { return "aaa";}
+ default public String bbb() { return "bbb";}
+ default public String ddd() { return "ddd";}
+ default public String eee() { return "eee";}
+ default public String ggg() { return "ggg";}
+ }
+
+ static class ImplementorA implements InterfaceA {
+ public String aaa() { return "aa-";}
+ }
+
+ static class ImplementorA1 extends ImplementorA {
+ public String bbb() { return "bb-";}
+ }
+
+ static interface InterfaceB {
+ default public String aaa() { return "aaa"; }
+ default public String ccc() { return "ccc"; }
+ default public String ddd() { return "ddd"; }
+ default public String fff() { return "fff"; }
+ default public String ggg() { return "ggg"; }
+ }
+
+ static class ImplementorB implements InterfaceB {
+ public String ggg() { return "gg-";}
+ }
+
+ static class ImplementorB1 extends ImplementorB {
+ public String fff() { return "ff-";}
+ }
+
+
+ public static void main(String args[]) {
+ testSimpleMethods();
+ testDefaultMethods();
+ testMixedInterfaces();
+ }
+
+ static void testSimpleMethods() {
+ // When HelloA and HelloB are copied into the dynamic archive, the Symbols
+ // for their method's names will have a different sorting order. This requires
+ // that the dumped InstanceKlass to re-sort their "methods" array and re-layout
+ // the vtables/itables.
+ HelloA1 a1 = new HelloA1();
+ HelloA a = new HelloA();
+ assertEqual(a.aaaa(), "aaaa");
+ assertEqual(a.bbbb(), "bbbb");
+ assertEqual(a.dddd(), "dddd");
+ assertEqual(a.eeee(), "eeee");
+ assertEqual(a.gggg(), "gggg");
+
+ assertEqual(a1.aaaa(), "aaa-");
+ assertEqual(a1.bbbb(), "bbbb");
+ assertEqual(a1.dddd(), "ddd-");
+ assertEqual(a1.eeee(), "eeee");
+ assertEqual(a1.gggg(), "ggg-");
+
+ HelloB b = new HelloB();
+ assertEqual(b.aaaa(), "aaaa");
+ assertEqual(b.cccc(), "cccc");
+ assertEqual(b.dddd(), "dddd");
+ assertEqual(b.ffff(), "ffff");
+ assertEqual(b.gggg(), "gggg");
+
+ HelloB b1 = new HelloB1();
+ assertEqual(b1.aaaa(), "aaa-");
+ assertEqual(b1.cccc(), "cccc");
+ assertEqual(b1.dddd(), "ddd-");
+ assertEqual(b1.ffff(), "ffff");
+ assertEqual(b1.gggg(), "ggg-");
+ }
+
+ static void testDefaultMethods() {
+ InterfaceA a1 = new ImplementorA1();
+ InterfaceA a = new ImplementorA();
+
+ assertEqual(a.aaa(), "aa-");
+ assertEqual(a.bbb(), "bbb");
+ assertEqual(a.ddd(), "ddd");
+ assertEqual(a.eee(), "eee");
+ assertEqual(a.ggg(), "ggg");
+
+ assertEqual(a1.aaa(), "aa-");
+ assertEqual(a1.bbb(), "bb-");
+ assertEqual(a1.ddd(), "ddd");
+ assertEqual(a1.eee(), "eee");
+ assertEqual(a1.ggg(), "ggg");
+
+ InterfaceB b = new ImplementorB();
+ InterfaceB b1 = new ImplementorB1();
+
+ assertEqual(b.aaa(), "aaa");
+ assertEqual(b.ccc(), "ccc");
+ assertEqual(b.ddd(), "ddd");
+ assertEqual(b.fff(), "fff");
+ assertEqual(b.ggg(), "gg-");
+
+ assertEqual(b1.aaa(), "aaa");
+ assertEqual(b1.ccc(), "ccc");
+ assertEqual(b1.ddd(), "ddd");
+ assertEqual(b1.fff(), "ff-");
+ assertEqual(b1.ggg(), "gg-");
+ }
+
+ // This is a regression test for an earlier bug in
+ // DynamicArchiveBuilder::relocate_buffer_to_target()
+ static void testMixedInterfaces() {
+ Object xx = new SynchronousQueue();
+ BlockingQueue yy = (BlockingQueue)xx;
+ }
+
+ static private void assertEqual(String a, String b) {
+ if (!a.equals(b)) {
+ throw new RuntimeException(a + " is not equal to " + b);
+ } else {
+ System.out.println("Expected: " + a + ", got: " + b);
+ }
+ }
+}