archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Tatiana Pivovarova 2016-06-29 11:38:58 +00:00
commit c38fb9f0c8
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
View file

@ -68,6 +68,11 @@ public class Compiler {
if (Utils.COMPILE_THE_WORLD_PRELOAD_CLASSES) { if (Utils.COMPILE_THE_WORLD_PRELOAD_CLASSES) {
preloadClasses(aClass.getName(), id, constantPool); preloadClasses(aClass.getName(), id, constantPool);
} }
int startLevel = Utils.INITIAL_COMP_LEVEL;
int endLevel = Utils.TIERED_COMPILATION ? Utils.TIERED_STOP_AT_LEVEL : startLevel;
for (int i = startLevel; i <= endLevel; ++i) {
WHITE_BOX.enqueueInitializerForCompilation(aClass, i);
}
long methodCount = 0; long methodCount = 0;
for (Executable e : aClass.getDeclaredConstructors()) { for (Executable e : aClass.getDeclaredConstructors()) {
++methodCount; ++methodCount;

2
hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java
View file

@ -40,6 +40,7 @@ import java.util.concurrent.Executor;
* Concrete subclasses should implement method {@link #process()}. * Concrete subclasses should implement method {@link #process()}.
*/ */
public abstract class PathHandler { public abstract class PathHandler {
private static final Unsafe UNSAFE = jdk.test.lib.Utils.getUnsafe();
private static final AtomicLong CLASS_COUNT = new AtomicLong(0L); private static final AtomicLong CLASS_COUNT = new AtomicLong(0L);
private static volatile boolean CLASSES_LIMIT_REACHED = false; private static volatile boolean CLASSES_LIMIT_REACHED = false;
private static final Pattern JAR_IN_DIR_PATTERN private static final Pattern JAR_IN_DIR_PATTERN
@ -151,6 +152,7 @@ public abstract class PathHandler {
if (id >= Utils.COMPILE_THE_WORLD_START_AT) { if (id >= Utils.COMPILE_THE_WORLD_START_AT) {
try { try {
Class<?> aClass = loader.loadClass(name); Class<?> aClass = loader.loadClass(name);
UNSAFE.ensureClassInitialized(aClass);
CompileTheWorld.OUT.printf("[%d]\t%s%n", id, name); CompileTheWorld.OUT.printf("[%d]\t%s%n", id, name);
Compiler.compileClass(aClass, id, executor); Compiler.compileClass(aClass, id, executor);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {