hg: jdk7/jdk7/hotspot: 17 new changesets

erik.trimble at sun.com erik.trimble at sun.com
Tue Oct 13 15:56:10 PDT 2009 

Changeset: 685e959d09ea
Author:    cfang
Date:      2009-09-14 09:49 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/685e959d09ea

6877254: Server vm crashes with no branches off of store slice" when run with CMS and UseSuperWord(default)
Summary: design StoreCMNode::Ideal to promote its oopStore input if the input is a MergeMem node
Reviewed-by: kvn, never

! src/share/vm/opto/graphKit.cpp
! src/share/vm/opto/graphKit.hpp
! src/share/vm/opto/idealKit.cpp
! src/share/vm/opto/idealKit.hpp
! src/share/vm/opto/memnode.cpp
! src/share/vm/opto/memnode.hpp
! src/share/vm/opto/superword.cpp
+ test/compiler/6877254/Test.java

Changeset: 62001a362ce9
Author:    kvn
Date:      2009-09-14 12:14 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/62001a362ce9

6827605: new String intrinsics may prevent EA scalar replacement
6875866: Intrinsic for String.indexOf() is broken on x86 with SSE4.2
Summary: Modify String intrinsic methods to pass char[] pointers instead of string oops.
Reviewed-by: never

! src/cpu/sparc/vm/assembler_sparc.cpp
! src/cpu/sparc/vm/assembler_sparc.hpp
! src/cpu/sparc/vm/sparc.ad
! src/cpu/x86/vm/assembler_x86.cpp
! src/cpu/x86/vm/assembler_x86.hpp
! src/cpu/x86/vm/x86_32.ad
! src/cpu/x86/vm/x86_64.ad
! src/share/vm/adlc/formssel.cpp
! src/share/vm/opto/library_call.cpp
! src/share/vm/opto/matcher.cpp
! src/share/vm/opto/memnode.cpp
! src/share/vm/opto/memnode.hpp
+ test/compiler/6875866/Test.java

Changeset: 00977607da34
Author:    cfang
Date:      2009-09-15 11:09 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/00977607da34

6879921: CTW failure jdk6_18/hotspot/src/share/vm/utilities/globalDefinitions.cpp:268
Summary: filter out non-primitives before deciding whether two ops can be packed
Reviewed-by: kvn, never

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

Changeset: 7e309ecb83ce
Author:    kvn
Date:      2009-09-15 19:03 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/7e309ecb83ce

6879362: assert(!klass_is_exact(),"only non-exact klass")
Summary: Do nothing for AddP node which has type not related to the type of allocated object.
Reviewed-by: never

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

Changeset: 148e5441d916
Author:    jrose
Date:      2009-09-15 21:53 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/148e5441d916

6863023: need non-perm oops in code cache for JSR 292
Summary: Make a special root-list for those few nmethods which might contain non-perm oops.
Reviewed-by: twisti, kvn, never, jmasa, ysr

! agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java
! agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java
! src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
! src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
! src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
! src/cpu/x86/vm/x86_32.ad
! src/cpu/x86/vm/x86_64.ad
! src/share/vm/c1/c1_GraphBuilder.cpp
! src/share/vm/c1/c1_InstructionPrinter.cpp
! src/share/vm/c1/c1_LIRGenerator.cpp
! src/share/vm/c1/c1_ValueType.cpp
! src/share/vm/ci/ciEnv.cpp
! src/share/vm/ci/ciEnv.hpp
! src/share/vm/ci/ciObject.cpp
! src/share/vm/ci/ciObject.hpp
! src/share/vm/ci/ciObjectFactory.cpp
! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/code/codeBlob.hpp
! src/share/vm/code/codeCache.cpp
! src/share/vm/code/codeCache.hpp
! src/share/vm/code/debugInfoRec.cpp
! src/share/vm/code/dependencies.cpp
! src/share/vm/code/nmethod.cpp
! src/share/vm/code/nmethod.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
! src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
! src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
! src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
! src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
! src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
! src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
! src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
! src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
! src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
! src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp
! src/share/vm/gc_implementation/shared/markSweep.cpp
! src/share/vm/gc_implementation/shared/markSweep.hpp
! src/share/vm/gc_interface/collectedHeap.hpp
! src/share/vm/memory/defNewGeneration.cpp
! src/share/vm/memory/genCollectedHeap.cpp
! src/share/vm/memory/genCollectedHeap.hpp
! src/share/vm/memory/genMarkSweep.cpp
! src/share/vm/memory/iterator.cpp
! src/share/vm/memory/iterator.hpp
! src/share/vm/memory/sharedHeap.cpp
! src/share/vm/memory/sharedHeap.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/oop.hpp
! src/share/vm/oops/oop.inline2.hpp
! src/share/vm/opto/output.cpp
! src/share/vm/opto/parse.hpp
! src/share/vm/opto/parse2.cpp
! src/share/vm/opto/parse3.cpp
! src/share/vm/opto/type.cpp
! src/share/vm/opto/type.hpp
! src/share/vm/prims/jvmtiTagMap.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/frame.cpp
! src/share/vm/runtime/frame.hpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/sweeper.cpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/runtime/thread.hpp
! src/share/vm/runtime/vmStructs.cpp
! src/share/vm/runtime/vmThread.cpp
! src/share/vm/runtime/vmThread.hpp
! src/share/vm/utilities/debug.cpp

Changeset: be094e0c089a
Author:    jrose
Date:      2009-09-15 22:50 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/be094e0c089a

Merge


Changeset: 3a2aa26bdc58
Author:    never
Date:      2009-09-16 11:06 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/3a2aa26bdc58

6854812: 6.0_14-b08 crashes with a SIGSEGV
Reviewed-by: kvn, twisti

! src/share/vm/ci/ciMethod.cpp
! src/share/vm/ci/ciMethod.hpp
! src/share/vm/ci/ciTypeFlow.cpp
! src/share/vm/opto/parse1.cpp

Changeset: 6a8ccac44f41
Author:    kvn
Date:      2009-09-18 09:57 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6a8ccac44f41

6820514: meet not symmetric failure in ctw
Summary: Add missing instance_id meet.
Reviewed-by: never

! src/share/vm/opto/type.cpp
! src/share/vm/opto/type.hpp

Changeset: 54b3b351d6f9
Author:    jrose
Date:      2009-09-23 23:56 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/54b3b351d6f9

Merge

! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/code/dependencies.cpp
! src/share/vm/code/nmethod.cpp
! src/share/vm/code/nmethod.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
! src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
! src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
! src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
- src/share/vm/gc_implementation/shared/coTracker.cpp
- src/share/vm/gc_implementation/shared/coTracker.hpp
- src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp
- src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp
! src/share/vm/gc_implementation/shared/markSweep.cpp
! src/share/vm/gc_implementation/shared/markSweep.hpp
! src/share/vm/gc_interface/collectedHeap.hpp
! src/share/vm/memory/genMarkSweep.cpp
! src/share/vm/memory/iterator.cpp
! src/share/vm/memory/iterator.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/sweeper.cpp
! src/share/vm/runtime/vmStructs.cpp

Changeset: 753cf9794df9
Author:    jrose
Date:      2009-09-23 23:57 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/753cf9794df9

6885169: merge of 4957990 and 6863023 causes conflict on do_nmethods
Summary: After mechanically merging changes, some by-hand adjustments are needed.
Reviewed-by: ysr

! src/share/vm/code/nmethod.cpp
! src/share/vm/code/nmethod.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/shared/markSweep.hpp
! src/share/vm/memory/iterator.cpp
! src/share/vm/memory/iterator.hpp

Changeset: ddd6f1182ae3
Author:    kvn
Date:      2009-09-25 13:26 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/ddd6f1182ae3

6883468: C2 compiler enters infinite loop in PhaseIterGVN::transform
Summary: Avoid ideal transformation ping-pong between AddPNode::Ideal() and CastX2PNode::Ideal().
Reviewed-by: cfang

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

Changeset: d6b9fd78f389
Author:    cfang
Date:      2009-09-28 17:14 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/d6b9fd78f389

6886353: For DeoptimizeALot, JTreg tests should "IgnoreUnrecognizedVMOptions on a product build
Summary: Add IgnoreUnrecognizedVMOptions for JTreg tests (on a product build) to pass with DeoptimizeALot
Reviewed-by: kvn

! test/compiler/6823453/Test.java
! test/compiler/6833129/Test.java

Changeset: 46b819ba120b
Author:    jrose
Date:      2009-09-30 13:25 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/46b819ba120b

Merge

! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
! src/share/vm/gc_implementation/shared/markSweep.cpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/runtime/thread.hpp

Changeset: a0107ba3bc53
Author:    johnc
Date:      2009-10-01 15:56 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/a0107ba3bc53

6887186: G1: Incorrect code generated for G1 pre-barrier by C1 on SPARC
Summary: Modify operand passed to C1 pre-barrier to be the operand representing the address of the object field that is being stored.
Reviewed-by: never

! src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp

Changeset: 708275a44e4a
Author:    tonyp
Date:      2009-10-03 10:53 -0400
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/708275a44e4a

Merge

! src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp

Changeset: a1423fe86a18
Author:    trims
Date:      2009-10-09 15:18 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/a1423fe86a18

Merge

! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
! src/share/vm/ci/ciObjectFactory.cpp
! src/share/vm/code/nmethod.hpp
! src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
! src/share/vm/gc_implementation/shared/markSweep.cpp
! src/share/vm/gc_implementation/shared/markSweep.hpp
! src/share/vm/memory/genMarkSweep.cpp
! src/share/vm/memory/iterator.cpp
! src/share/vm/memory/iterator.hpp
! src/share/vm/opto/idealKit.cpp
! src/share/vm/opto/idealKit.hpp
! src/share/vm/runtime/sweeper.cpp

Changeset: f4b900403d6e
Author:    trims
Date:      2009-10-09 15:21 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f4b900403d6e

6890293: Bump the HS17 build number to 03
Summary: Update the HS17 build number to 03
Reviewed-by: jcoomes

! make/hotspot_version

More information about the jdk7-dev mailing list