infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-24 09:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

8218758: [TESTBUG] compiler/cha/StrengthReduceInterfaceCall.java misses recompilation event

Browse Source 
Reviewed-by: iignatyev
This commit is contained in:
Vladimir Ivanov 2019-02-14 15:27:12 -08:00
parent f53dfaf5ab
commit 992f8f87ad
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java
View File

@ -53,6 +53,7 @@ import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.vm.annotation.DontInline;
import sun.hotspot.WhiteBox;
import sun.hotspot.code.NMethod;
import java.io.IOException;
import java.lang.annotation.Retention;
@ -695,10 +696,6 @@ public class StrengthReduceInterfaceCall {
public static final Unsafe U = Unsafe.getUnsafe();
interface Test<T> {
boolean isCompiled();
void assertNotCompiled();
void assertCompiled();
void call(T o);
T receiver(int id);
@ -733,14 +730,6 @@ public class StrengthReduceInterfaceCall {
};
}
default void compile(Runnable r) {
assertNotCompiled();
while(!isCompiled()) {
r.run();
}
assertCompiled();
}
default void initialize(Class<?>... cs) {
for (Class<?> c : cs) {
U.ensureClassInitialized(c);
@ -789,14 +778,31 @@ public class StrengthReduceInterfaceCall {
}));
}
@Override
public boolean isCompiled() { return WB.isMethodCompiled(TEST); }
@Override
public void assertNotCompiled() { assertFalse(isCompiled()); }
public void compile(Runnable r) {
while (!WB.isMethodCompiled(TEST)) {
for (int i = 0; i < 100; i++) {
r.run();
}
}
assertCompiled(); // record nmethod info
}
@Override
public void assertCompiled() { assertTrue(isCompiled()); }
private NMethod prevNM = null;
public void assertNotCompiled() {
NMethod curNM = NMethod.get(TEST, false);
assertTrue(prevNM != null); // was previously compiled
assertTrue(curNM == null || prevNM.compile_id != curNM.compile_id); // either no nmethod present or recompiled
prevNM = curNM; // update nmethod info
}
public void assertCompiled() {
NMethod curNM = NMethod.get(TEST, false);
assertTrue(curNM != null); // nmethod is present
assertTrue(prevNM == null || prevNM.compile_id == curNM.compile_id); // no recompilations if nmethod present
prevNM = curNM; // update nmethod info
}
@Override
public void call(T i) {