# HG changeset patch # User goetz # Date 1523450946 -7200 # Wed Apr 11 14:49:06 2018 +0200 # Node ID 1daca1f60d2f7638fd002d2273f695e2b0340288 # Parent 6b46983d6fbe6898cea52ba087c2e3271937b510 8201430: [TESTBUG] Remove script from runtime/6626217 diff --git a/test/hotspot/jtreg/runtime/6626217/Loader2.java b/test/hotspot/jtreg/runtime/6626217/Loader2.java --- a/test/hotspot/jtreg/runtime/6626217/Loader2.java +++ b/test/hotspot/jtreg/runtime/6626217/Loader2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, 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 @@ -36,7 +36,7 @@ print("Fetching the implementation of "+name); int old = _recur; try { - FileInputStream fi = new FileInputStream(name+".impl2"); + FileInputStream fi = new FileInputStream(name+".class"); byte result[] = new byte[fi.available()]; fi.read(result); diff --git a/test/hotspot/jtreg/runtime/6626217/Test6626217.sh b/test/hotspot/jtreg/runtime/6626217/Test6626217.sh deleted file mode 100644 --- a/test/hotspot/jtreg/runtime/6626217/Test6626217.sh +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright (c) 1998, 2014, 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. -# - - -# @test @(#)Test6626217.sh -# @bug 6626217 -# @summary Loader-constraint table allows arrays instead of only the base-classes -# @run shell Test6626217.sh -# -## some tests require path to find test source dir -if [ "${TESTSRC}" = "" ] -then - TESTSRC=${PWD} - echo "TESTSRC not set. Using "${TESTSRC}" as default" -fi -echo "TESTSRC=${TESTSRC}" -## Adding common setup Variables for running shell tests. -. ${TESTSRC}/../../test_env.sh - -JAVA=${TESTJAVA}${FS}bin${FS}java -JAVAC=${COMPILEJAVA}${FS}bin${FS}javac - -# Current directory is scratch directory, copy all the test source there -# (for the subsequent moves to work). -${CP} ${TESTSRC}${FS}* ${THIS_DIR} - -# A Clean Compile: this line will probably fail within jtreg as have a clean dir: -${RM} -f *.class *.impl many_loader.java - -# Make sure that the compilation steps occurs in the future as not to allow fast systems -# to copy and compile bug_21227.java so fast as to make the class and java have the same -# time stamp, which later on would make the compilation step of many_loader.java fail -sleep 2 - -# Compile all the usual suspects, including the default 'many_loader' -${CP} many_loader1.java.foo many_loader.java -${JAVAC} ${TESTJAVACOPTS} -Xlint *.java - -# Rename the class files, so the custom loader (and not the system loader) will find it -${MV} from_loader2.class from_loader2.impl2 - -# Compile the next version of 'many_loader' -${MV} many_loader.class many_loader.impl1 -${CP} many_loader2.java.foo many_loader.java -${JAVAC} ${TESTJAVACOPTS} -Xlint many_loader.java - -# Rename the class file, so the custom loader (and not the system loader) will find it -${MV} many_loader.class many_loader.impl2 -${MV} many_loader.impl1 many_loader.class -${RM} many_loader.java - -${JAVA} ${TESTOPTS} -Xverify -Xint -cp . bug_21227 >test.out 2>&1 -grep "loader constraint" test.out -exit $? - diff --git a/test/hotspot/jtreg/runtime/6626217/bug_21227.java b/test/hotspot/jtreg/runtime/6626217/bug_21227.java --- a/test/hotspot/jtreg/runtime/6626217/bug_21227.java +++ b/test/hotspot/jtreg/runtime/6626217/bug_21227.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, 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 @@ -22,63 +22,85 @@ * */ +/** + * @test + * @bug 6626217 + * @summary Loader-constraint table allows arrays instead of only the base-classes + * @library /test/lib + * @compile bug_21227.java from_loader2.java + * @run driver ClassFileInstaller from_loader2 + * @compile impl2/many_loader.java + * @run driver ClassFileInstaller many_loader + * @compile many_loader.java + * @run main/othervm -Xverify -Xint bug_21227 + */ + import java.lang.reflect.*; import java.security.*; abstract public class bug_21227 { - // Jam anything you want in here, it will be cast to a You_Have_Been_P0wned - public static Object _p0wnee; + // Jam anything you want in here, it will be cast to a You_Have_Been_P0wned. + public static Object _p0wnee; - public static void main(String argv[]) throws ClassNotFoundException, InstantiationException, IllegalAccessException { - System.out.println("Warmup"); + public static void main(String argv[]) throws ClassNotFoundException, InstantiationException, IllegalAccessException { + try { + System.out.println("Warmup"); - // Make a Class 'many_loader' under the default loader - bug_21227 bug = new many_loader(); + // Make a Class 'many_loader' under the default loader. + bug_21227 bug = new many_loader(); - // Some classes under a new Loader, LOADER2, including another version of 'many_loader' - ClassLoader LOADER2 = new Loader2(); - Class clazz2 = LOADER2.loadClass("from_loader2"); - IFace iface = (IFace)clazz2.newInstance(); + // Some classes under a new Loader, LOADER2, including another version of 'many_loader'. + ClassLoader LOADER2 = new Loader2(); + Class clazz2 = LOADER2.loadClass("from_loader2"); + IFace iface = (IFace)clazz2.newInstance(); - // Set the victim, a String of length 6 - String s = "victim"; - _p0wnee = s; + // Set the victim, a String of length 6. + String s = "victim"; + _p0wnee = s; - // Go cast '_p0wnee' to type You_Have_Been_P0wned - many_loader[] x2 = bug.make(iface); + // Go cast '_p0wnee' to type You_Have_Been_P0wned. + many_loader[] x2 = bug.make(iface); - many_loader b = x2[0]; + many_loader b = x2[0]; - // Make it clear that the runtime type many_loader (what we get from the - // array X2) varies from the static type of many_loader. - Class cl1 = b.getClass(); - ClassLoader ld1 = cl1.getClassLoader(); - Class cl2 = many_loader.class; - ClassLoader ld2 = cl2.getClassLoader(); - System.out.println("bug.make() "+ld1+":"+cl1); - System.out.println("many_loader "+ld2+":"+cl2); + // Make it clear that the runtime type many_loader (what we get from the + // array X2) varies from the static type of many_loader. + Class cl1 = b.getClass(); + ClassLoader ld1 = cl1.getClassLoader(); + Class cl2 = many_loader.class; + ClassLoader ld2 = cl2.getClassLoader(); + System.out.println("bug.make() "+ld1+":"+cl1); + System.out.println("many_loader "+ld2+":"+cl2); - // Read the victims guts out - You_Have_Been_P0wned q = b._p0wnee; - System.out.println("q._a = 0x"+Integer.toHexString(q._a)); - System.out.println("q._b = 0x"+Integer.toHexString(q._b)); - System.out.println("q._c = 0x"+Integer.toHexString(q._c)); - System.out.println("q._d = 0x"+Integer.toHexString(q._d)); + // Read the victims guts out. + You_Have_Been_P0wned q = b._p0wnee; + System.out.println("q._a = 0x"+Integer.toHexString(q._a)); + System.out.println("q._b = 0x"+Integer.toHexString(q._b)); + System.out.println("q._c = 0x"+Integer.toHexString(q._c)); + System.out.println("q._d = 0x"+Integer.toHexString(q._d)); - System.out.println("I will now crash the VM:"); - // On 32-bit HotSpot Java6 this sets the victim String length shorter, then crashes the VM - //q._c = 3; - q._a = -1; + System.out.println("I will now crash the VM:"); + // On 32-bit HotSpot Java6 this sets the victim String length shorter, then crashes the VM. + //q._c = 3; + q._a = -1; - System.out.println(s); + System.out.println(s); + throw new RuntimeException("Expected LinkageError was not thrown."); + } catch (LinkageError e) { + String errorMsg = e.getMessage(); + if (!errorMsg.contains("")) { + throw new RuntimeException("Error message of LinkageError does not contain \"loader constraint\":" + + errorMsg); + } + System.out.println("Passed with message: " + errorMsg); + } + } - } - - // I need to compile (hence call in a loop) a function which returns a value - // loaded from classloader other than the system one. The point of this - // call is to give me an abstract 'hook' into a function loaded with a - // foreign loader. - public abstract many_loader[] make( IFace iface ); // abstract factory + // I need to compile (hence call in a loop) a function which returns a value + // loaded from classloader other than the system one. The point of this + // call is to give me an abstract 'hook' into a function loaded with a + // foreign loader. + public abstract many_loader[] make(IFace iface); // abstract factory } diff --git a/test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo b/test/hotspot/jtreg/runtime/6626217/impl2/many_loader.java rename from test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo rename to test/hotspot/jtreg/runtime/6626217/impl2/many_loader.java --- a/test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo +++ b/test/hotspot/jtreg/runtime/6626217/impl2/many_loader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, 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 @@ -23,21 +23,21 @@ */ // A simple class to extend an abstract class and get loaded with different -// loaders. This class is loaded via LOADER2. A similar named class will +// loaders. This class is loaded via LOADER2. A similar named class will // be loaded via LOADER1. public class many_loader extends bug_21227 { - final Object _ref_to_be_p0wned; + final Object _ref_to_be_p0wned; - many_loader() { - _ref_to_be_p0wned = bug_21227._p0wnee; - System.out.println("Gonna hack this thing: " + _ref_to_be_p0wned.toString() ); - } + many_loader() { + _ref_to_be_p0wned = bug_21227._p0wnee; + System.out.println("Gonna hack this thing: " + _ref_to_be_p0wned.toString() ); + } - // I need to compile (hence call in a loop) a function which returns a value - // loaded from classloader other than the system one. The point of this - // call is to give me an abstract 'hook' into a function loaded with a - // foreign loader. - public many_loader[] make( IFace iface ) { - throw new Error("do not call me"); - } + // I need to compile (hence call in a loop) a function which returns a value + // loaded from classloader other than the system one. The point of this + // call is to give me an abstract 'hook' into a function loaded with a + // foreign loader. + public many_loader[] make(IFace iface) { + throw new Error("do not call me"); + } } diff --git a/test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo b/test/hotspot/jtreg/runtime/6626217/many_loader.java rename from test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo rename to test/hotspot/jtreg/runtime/6626217/many_loader.java --- a/test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo +++ b/test/hotspot/jtreg/runtime/6626217/many_loader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, 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 @@ -23,25 +23,25 @@ */ // A simple class to extend an abstract class and get loaded with different -// loaders. This class is loaded via LOADER1. A similar named class will +// loaders. This class is loaded via LOADER1. A similar named class will // be loaded via LOADER2. public class many_loader extends bug_21227 { - public You_Have_Been_P0wned _p0wnee; + public You_Have_Been_P0wned _p0wnee; - // I need to compile (hence call in a loop) a function which returns a value - // loaded from classloader other than the system one. The point of this - // call is to give me an abstract 'hook' into a function loaded with a - // foreign loader. + // I need to compile (hence call in a loop) a function which returns a value + // loaded from classloader other than the system one. The point of this + // call is to give me an abstract 'hook' into a function loaded with a + // foreign loader. - // The original 'make(boolean)' returns a bug_21227. The VM will inject a - // synthetic method to up-cast the returned 'from_loader1' into a - // 'bug_21227'. - public many_loader[] make( IFace iface ) { - // This function needs to return a value known to be loaded from LOADER2. - // Since I need to use a yet different loader, I need to make an unknown - // foreign call. In this case I'll be using an interface to make the - // unknown call, with but a single implementor so the compiler can do the - // upcast statically. - return iface==null ? null : iface.gen(); - } + // The original 'make(boolean)' returns a bug_21227. The VM will inject a + // synthetic method to up-cast the returned 'from_loader1' into a + // 'bug_21227'. + public many_loader[] make(IFace iface) { + // This function needs to return a value known to be loaded from LOADER2. + // Since I need to use a yet different loader, I need to make an unknown + // foreign call. In this case I'll be using an interface to make the + // unknown call, with but a single implementor so the compiler can do the + // upcast statically. + return iface==null ? null : iface.gen(); + } }