hg: jdk7/hotspot/hotspot: 12 new changesets

[tom.rodriguez at oracle.com]

Changeset: d4c1fbc3de95
Author:    iveresov
Date:      2011-05-06 12:12 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/d4c1fbc3de95

7042153: guarantee(x_compare_res != Constant::not_comparable) failed: incomparable constants in IfOp
Summary: Handle IfOps folding properly in case of unloaded constant oop arguments
Reviewed-by: kvn, never

! src/share/vm/c1/c1_InstructionPrinter.cpp
! src/share/vm/c1/c1_Optimizer.cpp
+ test/compiler/7042153/Test7042153.java

Changeset: 167b70ff3abc
Author:    never
Date:      2011-05-06 16:33 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/167b70ff3abc

6939861: JVM should handle more conversion operations
Reviewed-by: twisti, jrose

! src/cpu/x86/vm/assembler_x86.hpp
! src/cpu/x86/vm/frame_x86.cpp
! src/cpu/x86/vm/frame_x86.hpp
! src/cpu/x86/vm/frame_x86.inline.hpp
! src/cpu/x86/vm/interpreter_x86.hpp
! src/cpu/x86/vm/methodHandles_x86.cpp
+ src/cpu/x86/vm/methodHandles_x86.hpp
! src/cpu/x86/vm/sharedRuntime_x86_32.cpp
! src/cpu/x86/vm/sharedRuntime_x86_64.cpp
! src/cpu/x86/vm/stubRoutines_x86_32.hpp
! src/cpu/x86/vm/stubRoutines_x86_64.hpp
! src/share/vm/classfile/javaClasses.cpp
! src/share/vm/classfile/javaClasses.hpp
! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/classfile/vmSymbols.hpp
! src/share/vm/code/codeBlob.cpp
! src/share/vm/code/codeBlob.hpp
! src/share/vm/code/codeCache.cpp
! src/share/vm/compiler/disassembler.cpp
! src/share/vm/prims/jvmtiTagMap.cpp
! src/share/vm/prims/methodHandleWalk.cpp
! src/share/vm/prims/methodHandles.cpp
! src/share/vm/prims/methodHandles.hpp
! src/share/vm/runtime/frame.cpp
! src/share/vm/runtime/frame.hpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/sharedRuntime.hpp
! src/share/vm/services/heapDumper.cpp

Changeset: 566ea7a12419
Author:    never
Date:      2011-05-06 19:34 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/566ea7a12419

Merge

! src/share/vm/runtime/globals.hpp

Changeset: 3cfb240033d1
Author:    never
Date:      2011-05-09 19:45 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/3cfb240033d1

7043301: assert(locals < caller->fp() || locals > (caller->fp() + 16)) failed: locals in save area
Reviewed-by: kvn

! src/cpu/sparc/vm/frame_sparc.cpp
! src/cpu/sparc/vm/templateInterpreter_sparc.cpp
! src/cpu/x86/vm/frame_x86.cpp
! src/share/vm/runtime/frame.cpp
! src/share/vm/runtime/frame.hpp

Changeset: e2a92dd0d3d2
Author:    twisti
Date:      2011-05-10 00:45 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/e2a92dd0d3d2

7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
Reviewed-by: jrose, never, kvn

! src/share/vm/ci/ciMethodHandle.cpp
! src/share/vm/ci/ciMethodHandle.hpp
! src/share/vm/opto/bytecodeInfo.cpp
! src/share/vm/opto/doCall.cpp
! src/share/vm/opto/parse.hpp
! src/share/vm/prims/methodHandleWalk.cpp
! src/share/vm/prims/methodHandleWalk.hpp

Changeset: 3b1d58916d5f
Author:    kvn
Date:      2011-05-10 12:57 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/3b1d58916d5f

7043552: regression after 7042327
Summary: Generate Opaque2 node only during first unroll.
Reviewed-by: never

! src/share/vm/opto/loopTransform.cpp

Changeset: 69c94f488271
Author:    never
Date:      2011-05-10 17:44 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/69c94f488271

7043040: JSR292: JRuby bench/shootout/binarytrees.ruby-2.ruby SEGV: constantPoolKlass::oop_follow_contents
Reviewed-by: kvn, ysr

! src/share/vm/oops/constantPoolKlass.cpp

Changeset: 3d2ab563047a
Author:    never
Date:      2011-05-12 10:29 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/3d2ab563047a

7043461: VM crashes in void LinkResolver::runtime_resolve_virtual_method
Reviewed-by: kvn, coleenp

! src/cpu/sparc/vm/cppInterpreter_sparc.cpp
! src/cpu/sparc/vm/interpreter_sparc.cpp
! src/cpu/sparc/vm/templateInterpreter_sparc.cpp
! src/cpu/x86/vm/cppInterpreter_x86.cpp
! src/cpu/x86/vm/interpreter_x86_32.cpp
! src/cpu/x86/vm/interpreter_x86_64.cpp
! src/cpu/x86/vm/templateInterpreter_x86_32.cpp
! src/cpu/x86/vm/templateInterpreter_x86_64.cpp
! src/cpu/zero/vm/cppInterpreter_zero.cpp
! src/cpu/zero/vm/interpreter_zero.cpp
! src/share/vm/interpreter/abstractInterpreter.hpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/deoptimization.hpp
! src/share/vm/runtime/frame.cpp
! src/share/vm/runtime/vframeArray.cpp
! src/share/vm/runtime/vframeArray.hpp

Changeset: 2f17eb233d13
Author:    never
Date:      2011-05-12 10:33 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/2f17eb233d13

Merge


Changeset: fabcf26ee72f
Author:    twisti
Date:      2011-05-12 14:04 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/fabcf26ee72f

6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
Reviewed-by: jrose, kvn, never

! src/cpu/sparc/vm/methodHandles_sparc.cpp
! src/cpu/x86/vm/methodHandles_x86.cpp
! src/share/vm/ci/ciMethodData.hpp
! src/share/vm/ci/ciMethodHandle.cpp
! src/share/vm/ci/ciMethodHandle.hpp
! src/share/vm/opto/doCall.cpp
! src/share/vm/prims/methodHandleWalk.cpp
! src/share/vm/prims/methodHandleWalk.hpp
! src/share/vm/prims/methodHandles.cpp
! src/share/vm/prims/methodHandles.hpp

Changeset: 3fd6f2d58ef3
Author:    never
Date:      2011-05-12 16:24 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/3fd6f2d58ef3

Merge


Changeset: 688202ef6306
Author:    never
Date:      2011-05-12 19:39 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/688202ef6306

Merge

! src/share/vm/classfile/vmSymbols.hpp
! src/share/vm/runtime/globals.hpp