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

[vladimir.kozlov at oracle.com]

Changeset: b0ff910edfc9
Author:    kvn
Date:      2012-01-12 14:45 -0800
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/b0ff910edfc9

7128355: assert(!nocreate) failed: Cannot build a phi for a block already parsed
Summary: Do not common BoxLock nodes and avoid creating phis of boxes.
Reviewed-by: never

! src/share/vm/opto/callnode.cpp
! src/share/vm/opto/locknode.cpp
! src/share/vm/opto/locknode.hpp
! src/share/vm/opto/macro.cpp
! src/share/vm/opto/parse1.cpp

Changeset: f4d8930a45b9
Author:    jrose
Date:      2012-01-13 00:51 -0800
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/f4d8930a45b9

Merge


Changeset: 89d0a5d40008
Author:    kvn
Date:      2012-01-13 12:58 -0800
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/89d0a5d40008

7129618: assert(obj_node->eqv_uncast(obj),"");
Summary: Relax verification and locks elimination checks for new implementation (EliminateNestedLocks).
Reviewed-by: iveresov

! src/share/vm/opto/locknode.cpp
! src/share/vm/opto/macro.cpp

Changeset: e504fd26c073
Author:    kvn
Date:      2012-01-13 14:21 -0800
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/e504fd26c073

Merge