infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 18:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

8044364: runtime/RedefineFinalizer test fails on windows

Browse Source 
Rewrote the test in pure Java, added RedefineClassHelper utility class

Reviewed-by: coleenp, allwin, gtriantafill, dsamersoff
This commit is contained in:
Christian Tornqvist 2014-06-02 19:08:18 +02:00
parent d48bda2c52
commit fd282f6e9a
7 changed files with 145 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
hotspot/test/runtime/RedefineFinalizer/Agent.java
View File

@ -1,94 +0,0 @@
/*
* Copyright (c) 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.
*/
import java.lang.instrument.Instrumentation;
import java.lang.instrument.ClassDefinition;
import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.Label;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.org.objectweb.asm.Opcodes;
public class Agent implements Opcodes {
private static byte[] makeNewMartyr() {
ClassWriter cw = new ClassWriter(0);
MethodVisitor mv;
cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "Martyr", null, "java/lang/Object", null);
cw.visitSource(null, null);
{
mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
mv.visitCode();
Label lab0 = new Label();
mv.visitLabel(lab0);
mv.visitLineNumber(1, lab0);
mv.visitVarInsn(ALOAD, 0);
mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
mv.visitInsn(RETURN);
mv.visitMaxs(1, 1);
mv.visitEnd();
}
{
mv = cw.visitMethod(ACC_PUBLIC, "getName", "()Ljava/lang/String;", null, null);
mv.visitCode();
Label lab0 = new Label();
mv.visitLabel(lab0);
mv.visitLineNumber(6, lab0);
mv.visitLdcInsn("Redefinition done");
mv.visitInsn(ARETURN);
mv.visitMaxs(1, 1);
mv.visitEnd();
}
{
mv = cw.visitMethod(ACC_PROTECTED, "finalize", "()V", null, null);
mv.visitCode();
Label lab0 = new Label();
mv.visitLabel(lab0);
mv.visitLineNumber(8, lab0);
mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
mv.visitLdcInsn("Finalizer called");
mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V");
mv.visitInsn(RETURN);
mv.visitMaxs(2, 1);
mv.visitEnd();
}
cw.visitEnd();
return cw.toByteArray();
}
public static void premain(String args, Instrumentation inst) throws Exception {
agentmain(args, inst);
}
public static void agentmain(String args, Instrumentation inst) throws Exception {
ClassDefinition martyrDef =
new ClassDefinition(Class.forName("Martyr"), makeNewMartyr());
inst.redefineClasses(martyrDef);
}
}

28
hotspot/test/runtime/RedefineFinalizer/MartyrSon.java
View File

@ -1,28 +0,0 @@
/*
* Copyright (c) 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.
*/
class MartyrSon extends Martyr {
public String getName() {
return super.getName();
}
}

48
hotspot/test/runtime/RedefineFinalizer/Main.java → hotspot/test/runtime/RedefineFinalizer/RedefineFinalizer.java
View File

@ -21,14 +21,44 @@
* questions.
*/
public class Main {
public static void main(String[] args) {
try {
MartyrSon m = new MartyrSon();
System.out.println(m.getName());
System.runFinalization();
} catch (Throwable e) {
e.printStackTrace();
}
/*
* @test
* @bug 6904403
* @summary Don't assert if we redefine finalize method
* @library /testlibrary
* @build RedefineClassHelper
* @run main RedefineClassHelper
* @run main/othervm -javaagent:redefineagent.jar RedefineFinalizer
*/
/*
* Regression test for hitting:
*
* assert(f == k->has_finalizer()) failed: inconsistent has_finalizer
*
* when redefining finalizer method
*/
public class RedefineFinalizer {
public static String newB =
"class RedefineFinalizer$B {" +
" protected void finalize() { " +
" System.out.println(\"Finalizer called\");" +
" }" +
"}";
public static void main(String[] args) throws Exception {
RedefineClassHelper.redefineClass(B.class, newB);
A a = new A();
}
static class A extends B {
}
static class B {
protected void finalize() {
// should be empty
}
}
}

5
hotspot/test/runtime/RedefineFinalizer/manifest.mf
View File

@ -1,5 +0,0 @@
Main-Class: Main
Agent-Class: Agent
Can-Redefine-Classes: true
Can-Retransform-Classes: true
Premain-Class: Agent

49
hotspot/test/runtime/RedefineFinalizer/testme.sh
View File

@ -1,49 +0,0 @@
#!/bin/sh
# Copyright (c) 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
# @bug 6904403
# @summary Don't assert if we redefine finalize method
# @run shell testme.sh
# This test shouldn't provoke and assert(f == k->has_finalizer()) failed: inconsistent has_finalizer
. ${TESTSRC}/../../test_env.sh
JAVAC=${COMPILEJAVA}${FS}bin${FS}javac
JAR=${COMPILEJAVA}${FS}bin${FS}jar
JAVA=${TESTJAVA}${FS}bin${FS}java
TOOLS_JAR=${TESTJAVA}${FS}lib${FS}tools.jar
cp ${TESTSRC}${FS}*.java .
${JAVAC} -XDignore.symbol.file -classpath ${TOOLS_JAR} -sourcepath ${TESTSRC} *.java
if [ $? -eq 1 ]
then
echo "Compilation failed"
exit
fi
${JAR} cvfm testcase.jar ${TESTSRC}/manifest.mf .
${JAVA} -Xbootclasspath/a:${TOOLS_JAR} -javaagent:${PWD}/testcase.jar Main

79
hotspot/test/testlibrary/RedefineClassHelper.java Normal file
View File

@ -0,0 +1,79 @@
/*
* Copyright (c) 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.
*/
import java.io.PrintWriter;
import java.lang.instrument.*;
import com.oracle.java.testlibrary.*;
/*
* Helper class to write tests that redefine classes.
* When main method is run, it will create a redefineagent.jar that can be used
* with the -javaagent option to support redefining classes in jtreg tests.
*
* See sample test in test/testlibrary_tests/RedefineClassTest.java
*/
public class RedefineClassHelper {
public static Instrumentation instrumentation;
public static void premain(String agentArgs, Instrumentation inst) {
instrumentation = inst;
}
/**
* Redefine a class
*
* @param clazz Class to redefine
* @param javacode String with the new java code for the class to be redefined
*/
public static void redefineClass(Class clazz, String javacode) throws Exception {
byte[] bytecode = InMemoryJavaCompiler.compile(clazz.getName(), javacode);
redefineClass(clazz, bytecode);
}
/**
* Redefine a class
*
* @param clazz Class to redefine
* @param bytecode byte[] with the new class
*/
public static void redefineClass(Class clazz, byte[] bytecode) throws Exception {
instrumentation.redefineClasses(new ClassDefinition(clazz, bytecode));
}
/**
* Main method to be invoked before test to create the redefineagent.jar
*/
public static void main(String[] args) throws Exception {
ClassFileInstaller.main("RedefineClassHelper");
PrintWriter pw = new PrintWriter("MANIFEST.MF");
pw.println("Premain-Class: RedefineClassHelper");
pw.println("Can-Redefine-Classes: true");
pw.close();
sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefineClassHelper.class" })) {
throw new Exception("jar operation failed");
}
}
}

33
hotspot/test/runtime/RedefineFinalizer/Martyr.java → hotspot/test/testlibrary_tests/RedefineClassTest.java
View File

@ -21,13 +21,34 @@
* questions.
*/
public class Martyr {
public String getName() {
return "Redefinition NOT done";
/*
* @test
* @library /testlibrary
* @summary Proof of concept test for RedefineClassHelper
* @build RedefineClassHelper
* @run main RedefineClassHelper
* @run main/othervm -javaagent:redefineagent.jar RedefineClassTest
*/
import static com.oracle.java.testlibrary.Asserts.*;
import com.oracle.java.testlibrary.*;
/*
* Proof of concept test for the test utility class RedefineClassHelper
*/
public class RedefineClassTest {
public static String newClass = "class RedefineClassTest$A { public int Method() { return 2; } }";
public static void main(String[] args) throws Exception {
A a = new A();
assertTrue(a.Method() == 1);
RedefineClassHelper.redefineClass(A.class, newClass);
assertTrue(a.Method() == 2);
}
protected void finalize() {
// should be empty
static class A {
public int Method() {
return 1;
}
}
}