hg: jdk7/jdk7/hotspot: 12 new changesets

[john.coomes at oracle.com]

Changeset: 2b27ef5c2173
Author:    kvn
Date:      2011-05-20 12:46 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/2b27ef5c2173

7046096: SEGV IN C2 WITH 6U25
Summary: Missing fail flag set in strings concatenation code.
Reviewed-by: never

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

Changeset: cfbca4d74a61
Author:    jcoomes
Date:      2011-05-20 22:27 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/cfbca4d74a61

Merge


Changeset: 789d04408ca3
Author:    kvn
Date:      2011-05-21 11:44 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/789d04408ca3

7045693: java/util/EnumSet/EnumSetBash.java still failing intermittently
Summary: New limit for unrolled loop should be set only for zero trip guard and loop iteration test.
Reviewed-by: never

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

Changeset: b55f5bd7ec66
Author:    kvn
Date:      2011-05-21 13:59 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/b55f5bd7ec66

7045506: assert(!can_reshape || !new_phi) failed: for igvn new phi should be hooked
Summary: Replace the assert in PhiNode::Ideal with check to avoid transformation of new phi.
Reviewed-by: never

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

Changeset: 7523488edce5
Author:    kvn
Date:      2011-05-24 12:54 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/7523488edce5

7047300: VM crashes with assert(_base == InstPtr) failed: Not an object pointer
Summary: The code incorrectly used is_instptr() instead of is_oopptr() to get const_oop.
Reviewed-by: never

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

Changeset: ccf072cdba91
Author:    iveresov
Date:      2011-05-24 15:30 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/ccf072cdba91

7046893: LP64 problem with double_quadword in c1_LIRAssembler_x86.cpp
Summary: Fixed invalid casts in address computation
Reviewed-by: kvn, never
Contributed-by: thomas.salter at unisys.com

! src/cpu/x86/vm/c1_LIRAssembler_x86.cpp

Changeset: 28a9fe9534ea
Author:    kvn
Date:      2011-05-24 20:24 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/28a9fe9534ea

7048030: is_scavengable changes causing compiler to embed more constants
Summary: ciObject::can_be_constant() and should_be_constant() should use is_perm() instead of !is_scavengable()
Reviewed-by: never, jrose

! src/share/vm/ci/ciObject.cpp
! src/share/vm/ci/ciObject.hpp

Changeset: 7db2b9499c36
Author:    never
Date:      2011-05-25 16:04 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/7db2b9499c36

7046732: JSR 292 assert(result == cpce->f1()) failed: expected result for assembly code
Reviewed-by: kvn, iveresov, jrose

! src/share/vm/interpreter/interpreterRuntime.cpp

Changeset: 2d4b2b833d29
Author:    coleenp
Date:      2011-05-27 15:04 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/2d4b2b833d29

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: 8cbcd406c42e
Author:    ysr
Date:      2011-05-27 15:05 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/8cbcd406c42e

7042740: CMS: assert(n> q) failed: Looping at: ... blockOffsetTable.cpp:557
Summary: Do a one-step look-ahead, when sweeping free or garbage blocks, to avoid overstepping sweep limit, which may become a non-block-boundary because of a heap expansion delta coalescing with a previously co-terminal free block.
Reviewed-by: brutisso, tonyp

! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
! src/share/vm/memory/blockOffsetTable.cpp

Changeset: b36598cf2c62
Author:    jcoomes
Date:      2011-05-27 23:55 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/b36598cf2c62

Merge


Changeset: 472fc37e14a9
Author:    jcoomes
Date:      2011-05-27 23:55 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/472fc37e14a9

7049385: Bump the HS21 build number to 15
Summary: Update the HS21 build number to 15
Reviewed-by: trims

! make/hotspot_version