hg: jdk9/hs-comp/hotspot: 2 new changesets

[tobias.hartmann at oracle.com]

Changeset: 400c6e3c13a4
Author:    thartmann
Date:      2014-10-17 10:04 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs-comp/hotspot/rev/400c6e3c13a4

8060454: [TESTBUG] Whitebox tests fail with -XX:CompileThreshold=100
Summary: Move the call to 'waitAndDeoptimize' from the warmup methods to the osr triggering methods to make sure that no non-osr compilation is in the queue after warmup.
Reviewed-by: kvn

! test/compiler/whitebox/CompilerWhiteBoxTest.java

Changeset: a931540f0543
Author:    thartmann
Date:      2014-10-17 08:27 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs-comp/hotspot/rev/a931540f0543

Merge