archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Albert Noll 2014-05-30 19:21:42 +00:00
commit f35c3e76a4
2 changed files with 56 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hotspot/test/TEST.groups
View file

@ -115,6 +115,7 @@ compact3 = \
# Tests that require compact3 API's # Tests that require compact3 API's
# #
needs_compact3 = \ needs_compact3 = \
compiler/8009761/Test8009761.java \
compiler/whitebox/DeoptimizeMethodTest.java \ compiler/whitebox/DeoptimizeMethodTest.java \
compiler/whitebox/SetForceInlineMethodTest.java \ compiler/whitebox/SetForceInlineMethodTest.java \
compiler/whitebox/SetDontInlineMethodTest.java \ compiler/whitebox/SetDontInlineMethodTest.java \

69
hotspot/test/compiler/8009761/Test8009761.java
View file

@ -21,19 +21,27 @@
* questions. * questions.
*/ */
import com.sun.management.HotSpotDiagnosticMXBean;
import com.sun.management.VMOption;
import sun.hotspot.WhiteBox;
import sun.management.ManagementFactoryHelper;
import java.lang.reflect.Method;
/* /*
* @test * @test
* @bug 8009761 * @bug 8009761
* @library /testlibrary /testlibrary/whitebox
* @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates * @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates
* @run main/othervm -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss256K Test8009761 * @build Test8009761
* * @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss256K Test8009761
*/ */
public class Test8009761 { public class Test8009761 {
static class UnloadedClass { private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
volatile int i; private static int COMP_LEVEL_FULL_OPTIMIZATION = 4;
} private static Method m3 = null;
static Object m1(boolean deopt) { static Object m1(boolean deopt) {
// When running interpreted, on sparc, the caller's stack is // When running interpreted, on sparc, the caller's stack is
@ -142,9 +150,11 @@ public class Test8009761 {
ll508, ll509, ll510, ll511; ll508, ll509, ll510, ll511;
if (deopt) { if (deopt) {
UnloadedClass res = new UnloadedClass(); // sufficient to force deopt with c2 but not c1 // Force deoptimization of m3
res.i = 0; // forces deopt with c1 WHITE_BOX.deoptimizeMethod(m3);
return res; if(WHITE_BOX.isMethodCompiled(m3)) {
throw new RuntimeException(m3 + " not deoptimized");
}
} }
return null; return null;
} }
@ -225,6 +235,18 @@ public class Test8009761 {
} }
static public void main(String[] args) { static public void main(String[] args) {
// Make sure background compilation is disabled
if (backgroundCompilationEnabled()) {
throw new RuntimeException("Background compilation enabled");
}
try {
// Get Method object for m3
m3 = Test8009761.class.getDeclaredMethod("m3", boolean.class, boolean.class);
} catch (NoSuchMethodException | SecurityException ex) {
throw new RuntimeException("Failed to retrieve method m3");
}
int c1; int c1;
// Call m2 from m3 recursively until stack overflow. Count the number of recursive calls. // Call m2 from m3 recursively until stack overflow. Count the number of recursive calls.
try { try {
@ -232,10 +254,14 @@ public class Test8009761 {
} catch(StackOverflowError soe) { } catch(StackOverflowError soe) {
} }
c1 = count; c1 = count;
// Force the compilation of m3() that will inline m1() // Force the compilation of m3() that will inline m1()
for (int i = 0; i < 20000; i++) { WHITE_BOX.enqueueMethodForCompilation(m3, COMP_LEVEL_FULL_OPTIMIZATION);
m3(false, false); // Because background compilation is disabled, method should now be compiled
if(!WHITE_BOX.isMethodCompiled(m3)) {
throw new RuntimeException(m3 + " not compiled");
} }
count = 0; count = 0;
// Force deoptimization of m3() in m1(), then return from m1() // Force deoptimization of m3() in m1(), then return from m1()
// to m3(), call recursively m2(). If deoptimization correctly // to m3(), call recursively m2(). If deoptimization correctly
@ -245,11 +271,26 @@ public class Test8009761 {
m3(false, true); m3(false, true);
} catch(StackOverflowError soe) { } catch(StackOverflowError soe) {
} }
if (c1 != count) { // Allow number of recursive calls to vary by 1
System.out.println("Failed: init recursive calls: " + c1 + ". After deopt " + count); if ((c1 < (count - 1)) || (c1 > (count + 1))) {
System.exit(97); throw new RuntimeException("Failed: init recursive calls: " + c1 + ". After deopt " + count);
} else { } else {
System.out.println("PASSED " + c1); System.out.println("PASSED " + c1);
} }
} }
/**
* Checks if background compilation (-XX:+BackgroundCompilation) is enabled.
* @return True if background compilation is enabled, false otherwise
*/
private static boolean backgroundCompilationEnabled() {
HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
VMOption backgroundCompilation;
try {
backgroundCompilation = diagnostic.getVMOption("BackgroundCompilation");
} catch (IllegalArgumentException e) {
return false;
}
return Boolean.valueOf(backgroundCompilation.getValue());
}
} }