hg: hsx/hotspot-main/hotspot: 4 new changesets

[dmitriy.samersoff at oracle.com]

Changeset: d3b9f2be46ab
Author:    coleenp
Date:      2011-05-21 15:39 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/d3b9f2be46ab

7033141: assert(has_cp_cache(i)) failed: oob
Summary: Unrewrite bytecodes for OOM error allocating the constant pool cache.
Reviewed-by: dcubed, acorn, never

! src/share/vm/interpreter/rewriter.cpp
! src/share/vm/interpreter/rewriter.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/methodOop.cpp
! src/share/vm/prims/jvmtiRedefineClasses.cpp
! src/share/vm/prims/methodHandleWalk.cpp

Changeset: 9dd6c4ba364f
Author:    coleenp
Date:      2011-06-02 14:17 -0400
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/9dd6c4ba364f

7049928: VM crashes with "assert(_adapter != NULL) failed: must have" at methodOop.cpp:63
Summary: Removed extra change from another bug fix that caused this regression
Reviewed-by: phh, dcubed, kvn, kamg, never

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

Changeset: 96c891ebe56a
Author:    coleenp
Date:      2011-06-02 21:01 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/96c891ebe56a

Merge

! src/share/vm/prims/methodHandleWalk.cpp

Changeset: ae1d716e395c
Author:    dsamersoff
Date:      2011-06-09 01:33 +0400
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/ae1d716e395c

Merge