stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8201430: [TESTBUG] Remove script from runtime/6626217

Browse Source 
Reviewed-by: dholmes, mdoerr
This commit is contained in:
Goetz Lindenmaier 2018-04-11 14:49:06 +02:00
parent d974f0b162
commit f82560174b
6 changed files with 100 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/TEST.groups
View File

@ -177,7 +177,7 @@ tier1_gc_gcbasher = \
tier1_runtime = \
runtime/ \
-runtime/6626217/Test6626217.sh \
-runtime/6626217/bug_21227.java \
-runtime/7100935 \
-runtime/7158988/FieldMonitor.java \
-runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java \

4
test/hotspot/jtreg/runtime/6626217/Loader2.java
View File

@ -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 @@ public class Loader2 extends ClassLoader {
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);

75
test/hotspot/jtreg/runtime/6626217/Test6626217.sh
View File

@ -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 $?

42
test/hotspot/jtreg/runtime/6626217/bug_21227.java
View File

@ -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,30 +22,44 @@
*
*/
/**
* @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
// 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 {
try {
System.out.println("Warmup");
// Make a Class 'many_loader' under the default 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'
// 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
// Set the victim, a String of length 6.
String s = "victim";
_p0wnee = s;
// Go cast '_p0wnee' to type You_Have_Been_P0wned
// Go cast '_p0wnee' to type You_Have_Been_P0wned.
many_loader[] x2 = bug.make(iface);
many_loader b = x2[0];
@ -59,7 +73,7 @@ abstract public class bug_21227 {
System.out.println("bug.make() "+ld1+":"+cl1);
System.out.println("many_loader "+ld2+":"+cl2);
// Read the victims guts out
// 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));
@ -67,18 +81,26 @@ abstract public class bug_21227 {
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
// 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);
throw new RuntimeException("Expected LinkageError was not thrown.");
} catch (LinkageError e) {
String errorMsg = e.getMessage();
if (!errorMsg.contains("loader constraint")) {
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
public abstract many_loader[] make(IFace iface); // abstract factory
}

4
test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo → test/hotspot/jtreg/runtime/6626217/impl2/many_loader.java
View File

@ -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
@ -37,7 +37,7 @@ public class many_loader extends bug_21227 {
// 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 ) {
public many_loader[] make(IFace iface) {
throw new Error("do not call me");
}
}

4
test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo → test/hotspot/jtreg/runtime/6626217/many_loader.java
View File

@ -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 @@ public class many_loader extends bug_21227 {
// 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 ) {
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