Mercurial > hg > openjdk > jdk9 > hotspot
changeset 9773:891e9c2ac3b2
8145026: compiler/jsr292/NonInlinedCall/RedefineTest.java fails with: java.lang.NullPointerException in ClassFileInstaller.main
Reviewed-by: roland
author | vlivanov |
---|---|
date | Thu, 10 Dec 2015 14:51:54 +0300 |
parents | a6eb7b850dbd |
children | 8962380eb039 |
files | test/compiler/jsr292/NonInlinedCall/Agent.java test/compiler/jsr292/NonInlinedCall/GCTest.java test/compiler/jsr292/NonInlinedCall/InvokeTest.java test/compiler/jsr292/NonInlinedCall/RedefineTest.java |
diffstat | 4 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/test/compiler/jsr292/NonInlinedCall/Agent.java Thu Dec 10 14:51:53 2015 +0300 +++ b/test/compiler/jsr292/NonInlinedCall/Agent.java Thu Dec 10 14:51:54 2015 +0300 @@ -22,7 +22,6 @@ */ import java.io.File; import java.io.PrintStream; -import java.lang.instrument.Instrumentation; import java.util.Arrays; public class Agent {
--- a/test/compiler/jsr292/NonInlinedCall/GCTest.java Thu Dec 10 14:51:53 2015 +0300 +++ b/test/compiler/jsr292/NonInlinedCall/GCTest.java Thu Dec 10 14:51:54 2015 +0300 @@ -24,8 +24,8 @@ /* * @test * @bug 8072008 - * @library /testlibrary /../../test/lib - * @build GCTest NonInlinedReinvoker + * @library /testlibrary /test/lib + * @compile GCTest.java NonInlinedReinvoker.java * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * java.lang.invoke.GCTest @@ -40,10 +40,8 @@ package java.lang.invoke; import sun.hotspot.WhiteBox; - import jdk.internal.vm.annotation.DontInline; import jdk.internal.vm.annotation.Stable; - import java.lang.ref.*; import static jdk.test.lib.Asserts.*;
--- a/test/compiler/jsr292/NonInlinedCall/InvokeTest.java Thu Dec 10 14:51:53 2015 +0300 +++ b/test/compiler/jsr292/NonInlinedCall/InvokeTest.java Thu Dec 10 14:51:54 2015 +0300 @@ -24,8 +24,8 @@ /* * @test * @bug 8072008 - * @library /testlibrary /../../test/lib - * @build InvokeTest NonInlinedReinvoker + * @library /testlibrary /test/lib + * @compile InvokeTest.java NonInlinedReinvoker.java * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * java.lang.invoke.InvokeTest @@ -43,9 +43,7 @@ package java.lang.invoke; import sun.hotspot.WhiteBox; - import jdk.internal.vm.annotation.DontInline; - import static jdk.test.lib.Asserts.*; public class InvokeTest {
--- a/test/compiler/jsr292/NonInlinedCall/RedefineTest.java Thu Dec 10 14:51:53 2015 +0300 +++ b/test/compiler/jsr292/NonInlinedCall/RedefineTest.java Thu Dec 10 14:51:54 2015 +0300 @@ -24,8 +24,8 @@ /* * @test * @bug 8072008 - * @library /testlibrary /../../test/lib - * @build RedefineTest Agent + * @library /testlibrary /test/lib + * @compile -XDignore.symbol.file RedefineTest.java Agent.java * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * java.lang.invoke.RedefineTest @@ -42,10 +42,8 @@ import sun.hotspot.WhiteBox; import sun.misc.Unsafe; - import jdk.internal.org.objectweb.asm.*; import jdk.internal.vm.annotation.DontInline; - import java.lang.instrument.ClassDefinition; import java.lang.instrument.Instrumentation;