[security-dev 01314]: hg: jdk7/tl/hotspot: 54 new changesets

tim.bell at sun.com tim.bell at sun.com
Fri Oct 16 10:38:19 PDT 2009


Changeset: 489a4f8dcd0f
Author:    twisti
Date:      2009-08-27 06:17 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/489a4f8dcd0f

6865583: Verbose CIPrintMethodCodes asserts when ldc an empty String
Summary: ldc seems to load an empty String and that leads to an assert on offset < length, which are both zero.
Reviewed-by: kvn, never

! src/share/vm/classfile/javaClasses.cpp

Changeset: 8fe1963e3964
Author:    kvn
Date:      2009-08-28 11:19 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/8fe1963e3964

6875577: CTW fails with /hotspot/src/share/vm/opto/memnode.cpp
Summary: Fix do_null_check to check for unloaded klass for all oop pointers.
Reviewed-by: never, cfang

! src/share/vm/opto/graphKit.cpp
! src/share/vm/opto/library_call.cpp

Changeset: 1fbd5d696bf4
Author:    twisti
Date:      2009-08-31 02:24 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/1fbd5d696bf4

6875967: CTW fails with./generated/adfiles/ad_sparc.cpp:6711
Reviewed-by: cfang, never

! src/cpu/sparc/vm/sparc.ad

Changeset: ace8397c8563
Author:    cfang
Date:      2009-08-31 08:31 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/ace8397c8563

6876276: assert(!is_visited,"visit only once")
Summary: schedule the superword loads based on dependence constraints
Reviewed-by: kvn, never

! src/share/vm/opto/superword.cpp
! test/compiler/6636138/Test1.java
! test/compiler/6636138/Test2.java

Changeset: ff1a29907b6c
Author:    never
Date:      2009-08-31 17:07 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/ff1a29907b6c

6855215: Calculation error (NaN) after about 1500 calculations
Reviewed-by: kvn

! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
! src/cpu/x86/vm/c1_LinearScan_x86.cpp
! src/share/vm/c1/c1_LIR.cpp
! src/share/vm/c1/c1_LIR.hpp
+ test/compiler/6855215/Test6855215.java

Changeset: 0f1c19b7a52d
Author:    kvn
Date:      2009-09-08 10:42 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/0f1c19b7a52d

6875619: CTW fails with /hotspot/src/share/vm/opto/type.hpp
Summary: In load_array_length() cast array's type to TypeOopPtr when calling make_ideal_length() method.
Reviewed-by: never

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

Changeset: 26fbe81d30cf
Author:    kvn
Date:      2009-09-08 16:56 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/26fbe81d30cf

6880052: SIGSEGV in GraphKit::null_check_common()
Summary: Check that a klass is not NULL before the is_loaded() call.
Reviewed-by: never

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

Changeset: 9a4e87ba1a90
Author:    kvn
Date:      2009-09-09 16:28 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/9a4e87ba1a90

6880533: test/compiler/6865031/Test.java miss -XX:+IgnoreUnrecognizedVMOptions
Summary: Add missing test option -XX:+IgnoreUnrecognizedVMOptions.
Reviewed-by: never

! test/compiler/6865031/Test.java

Changeset: 159d56b94894
Author:    kvn
Date:      2009-09-10 10:36 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/159d56b94894

6880574: C2 assert in escape.cpp:445 on linux-amd64
Summary: Look through chained AddP nodes in get_addp_base().
Reviewed-by: jrose

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

Changeset: c7e94e8fff43
Author:    kvn
Date:      2009-09-10 18:18 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/c7e94e8fff43

6880053: assert(alloc_obj->as_CheckCastPP()->type() != TypeInstPtr::NOTNULL)
Summary: Removed second CheckCastPP and use MembarCPUOrder after arraycopy to cloned object.
Reviewed-by: never

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

Changeset: a6f533fc33e0
Author:    kvn
Date:      2009-09-14 11:45 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/a6f533fc33e0

Merge


Changeset: eb058abd0562
Author:    ysr
Date:      2009-09-15 16:50 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/eb058abd0562

6861557: G1: assert(top() == bottom() || zfs == Allocated,"Region must be empty, or ...")
Summary: Druing heap shrinking, check for emptiness of a region before modifying its ZF status.
Reviewed-by: tonyp

! src/share/vm/gc_implementation/g1/heapRegionSeq.cpp

Changeset: d7c9544cc141
Author:    apetrusenko
Date:      2009-09-18 06:02 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/d7c9544cc141

Merge


Changeset: aafa4232dfd7
Author:    asaha
Date:      2009-08-28 08:54 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/aafa4232dfd7

6821003: Update hotspot windows os_win32 for windows 7
Reviewed-by: xlu

! src/os/windows/vm/os_windows.cpp

Changeset: 9601152ccfc1
Author:    dcubed
Date:      2009-08-28 12:25 -0600
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/9601152ccfc1

6875393: 2/3 JNI itable index cache is broken
Summary: Add missing initialization of cache size.
Reviewed-by: tbell

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

Changeset: 75e30968ebe1
Author:    dcubed
Date:      2009-08-28 12:32 -0600
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/75e30968ebe1

Merge

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

Changeset: df97b1cf46d8
Author:    dcubed
Date:      2009-08-28 15:03 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/df97b1cf46d8

Merge


Changeset: bb287c042e99
Author:    apangin
Date:      2009-08-30 15:33 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/bb287c042e99

Merge


Changeset: 6918603297f7
Author:    poonam
Date:      2009-09-01 23:34 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/6918603297f7

6858208: jvm crash when specifying TypeProfileWidth=0 on jdk 6.0
Summary: Add an explicit check for TypeProfileWidth == 0 in record_klass_in_profile_helper() functions.
Reviewed-by: never, coleenp

! src/cpu/sparc/vm/interp_masm_sparc.cpp
! src/cpu/x86/vm/interp_masm_x86_32.cpp
! src/cpu/x86/vm/interp_masm_x86_64.cpp

Changeset: 5fdbe2cdf565
Author:    andrew
Date:      2009-09-08 09:01 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/5fdbe2cdf565

6879689: Fix warning about ignored return value when compiling with -O2
Summary: Store the return value of fwrite and check it matches the size of the array.
Reviewed-by: twisti, dholmes

! src/share/vm/adlc/archDesc.cpp

Changeset: 0804a88ed4f5
Author:    andrew
Date:      2009-09-08 09:02 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/0804a88ed4f5

Merge


Changeset: 682194ca1d8d
Author:    acorn
Date:      2009-09-10 09:04 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/682194ca1d8d

Merge

- 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/oops/instanceKlass.cpp

Changeset: 0fc81f0a8ca8
Author:    andrew
Date:      2009-09-12 12:50 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/0fc81f0a8ca8

6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
Summary: The build fails if the bootstrap JDK defaults to <1.5
Reviewed-by: jcoomes

! make/linux/makefiles/jvmti.make
! make/linux/makefiles/rules.make
! make/linux/makefiles/sa.make
! make/linux/makefiles/top.make
! make/solaris/makefiles/jvmti.make
! make/solaris/makefiles/rules.make
! make/solaris/makefiles/sa.make
! make/solaris/makefiles/top.make
! make/windows/makefiles/generated.make
! make/windows/makefiles/jvmti.make
! make/windows/makefiles/rules.make
! make/windows/makefiles/sa.make
! make/windows/projectfiles/common/Makefile

Changeset: e5b31fd85b72
Author:    acorn
Date:      2009-09-15 16:28 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/e5b31fd85b72

Merge


Changeset: ad6585fd4087
Author:    acorn
Date:      2009-09-04 12:53 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/ad6585fd4087

6830542: Performance: JVM_DefineClass already verified.
Reviewed-by: kamg, phh

! make/linux/makefiles/mapfile-vers-debug
! make/linux/makefiles/mapfile-vers-product
! make/solaris/makefiles/mapfile-vers
! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/classfile/classFileParser.hpp
! src/share/vm/classfile/classLoader.cpp
! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/classfile/systemDictionary.hpp
! src/share/vm/classfile/verifier.cpp
! src/share/vm/classfile/verifier.hpp
! src/share/vm/code/dependencies.cpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/instanceKlassKlass.cpp
! src/share/vm/prims/jni.cpp
! src/share/vm/prims/jvm.cpp
! src/share/vm/prims/jvm.h
! src/share/vm/prims/jvmtiRedefineClasses.cpp
! src/share/vm/runtime/vmStructs.cpp

Changeset: 26b774d693aa
Author:    acorn
Date:      2009-09-16 09:10 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/26b774d693aa

Merge

! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/classfile/classFileParser.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/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/instanceKlassKlass.cpp

Changeset: 83c29a26f67c
Author:    acorn
Date:      2009-09-16 15:42 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/83c29a26f67c

6879572: SA fails _is_marked_dependent not found
Reviewed-by: kamg, dcubed

! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/code/dependencies.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/instanceKlassKlass.cpp
! src/share/vm/runtime/vmStructs.cpp

Changeset: 723131383de6
Author:    acorn
Date:      2009-09-18 15:14 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/723131383de6

Merge


Changeset: 74a5db69c1fe
Author:    dcubed
Date:      2009-09-21 09:30 -0600
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/74a5db69c1fe

6419370: 4/4 new jmethodID code has tiny holes in synchronization
Summary: Fix races in jmethodID cache and JNI itable index cache.
Reviewed-by: ikrylov, acorn

! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/methodOop.hpp

Changeset: d72ba3205918
Author:    acorn
Date:      2009-09-21 18:10 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/d72ba3205918

Merge


Changeset: 87770dcf831b
Author:    dcubed
Date:      2009-09-22 21:12 -0600
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/87770dcf831b

6876794: 4/4 sp07t002 hangs very intermittently
Summary: remove over locking by VMThread on "is thread suspended?" check
Reviewed-by: dholmes, acorn, andrew

! src/share/vm/runtime/safepoint.cpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/runtime/thread.hpp

Changeset: c3c4a1d3801a
Author:    andrew
Date:      2009-09-23 11:36 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/c3c4a1d3801a

6884552: remove some unnecessary #ifdef's introduced in the fix for 4957990
Summary: Removed the unnecessary #ifdef's which were interfering with the build of the Zero-assembler port
Reviewed-by: ysr, jcoomes

! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
! src/share/vm/gc_implementation/shared/markSweep.cpp

Changeset: 1af62b6ca0f9
Author:    apetrusenko
Date:      2009-09-25 04:39 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/1af62b6ca0f9

Merge


Changeset: 7a102acc9f17
Author:    trims
Date:      2009-09-25 12:17 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/7a102acc9f17

Merge

! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
! src/share/vm/gc_implementation/shared/markSweep.cpp
! src/share/vm/prims/jvm.h

Changeset: faf94d94786b
Author:    trims
Date:      2009-09-25 12:19 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/faf94d94786b

6885900: Bump the HS17 build number to 02
Summary: Update the HS17 build number to 02
Reviewed-by: jcoomes

! make/hotspot_version

Changeset: 6ddec5389232
Author:    xdono
Date:      2009-10-02 11:26 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/6ddec5389232

Added tag jdk7-b73 for changeset faf94d94786b

! .hgtags

Changeset: 685e959d09ea
Author:    cfang
Date:      2009-09-14 09:49 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/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/tl/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/tl/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/tl/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/tl/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/tl/hotspot/rev/be094e0c089a

Merge


Changeset: 3a2aa26bdc58
Author:    never
Date:      2009-09-16 11:06 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/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/tl/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/tl/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/tl/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/tl/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/tl/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/tl/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/tl/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/tl/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/tl/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/tl/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

Changeset: 411c9c4ca96a
Author:    xdono
Date:      2009-10-15 16:40 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/411c9c4ca96a

Added tag jdk7-b74 for changeset f4b900403d6e

! .hgtags




More information about the security-dev mailing list