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

[tobias.hartmann at oracle.com]

Changeset: 3ef312b8e3a5
Author:    thartmann
Date:      2015-11-06 09:36 +0100
URL:       http://hg.openjdk.java.net/jdk9/hs-comp/hotspot/rev/3ef312b8e3a5

8140574: C2 must re-execute checks after deoptimizing from merged uncommon traps
Summary: Before merging uncommon traps we have to check for proper bci domination and compatible JVMStates to guarantee correct re-execution of the checks.
Reviewed-by: kvn, roland

! src/share/vm/ci/ciTypeFlow.cpp
! src/share/vm/ci/ciTypeFlow.hpp
! src/share/vm/opto/ifnode.cpp
+ test/compiler/rangechecks/TestUncommonTrapMerging.java

Changeset: 9a2a793d95e4
Author:    thartmann
Date:      2015-11-06 08:45 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs-comp/hotspot/rev/9a2a793d95e4

Merge

- src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/AbstractAddress.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlotValue.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/UnsignedMath.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualStackSlot.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.compiler/src/jdk/vm/ci/compiler/Compiler.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.compiler/src/jdk/vm/ci/compiler/CompilerFactory.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.compiler/src/jdk/vm/ci/compiler/StartupEventListener.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.options/src/jdk/vm/ci/options/JVMCIJarsOptionDescriptorsProvider.java
- test/compiler/jvmci/common/services/jdk.vm.ci.compiler.Compiler
- test/compiler/jvmci/common/services/jdk.vm.ci.compiler.CompilerFactory
- test/compiler/jvmci/events/JvmciCompleteInitializationTest.config
- test/compiler/jvmci/events/JvmciCompleteInitializationTest.java