Changeset: a88386380bda Author: xdono Date: 2009-06-18 13:05 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/a88386380bda
Added tag jdk7-b61 for changeset 27b728fd1281 ! .hgtags Changeset: 8754a3c37762 Author: xdono Date: 2009-06-25 12:09 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/8754a3c37762 Added tag jdk7-b62 for changeset a88386380bda ! .hgtags Changeset: f9c95d5dc41f Author: trims Date: 2009-06-25 22:01 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/f9c95d5dc41f Merge Changeset: 32c83fb84370 Author: trims Date: 2009-06-30 10:40 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/32c83fb84370 6856257: Bump the HS16 build number to 05 Summary: Update the HS16 build number to 05 Reviewed-by: jcoomes ! make/hotspot_version Changeset: b109e761e927 Author: kvn Date: 2009-06-09 16:19 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/b109e761e927 6837472: com/sun/jdi/MonitorFrameInfo.java fails with AggressiveOpts in 6u14 Summary: Disable escape analysis when jvmti/debugger is used. Add support for EA ibto SA. Reviewed-by: never ! agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java ! agent/src/share/classes/sun/jvm/hotspot/code/MonitorValue.java + agent/src/share/classes/sun/jvm/hotspot/code/ObjectValue.java ! agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java ! agent/src/share/classes/sun/jvm/hotspot/code/ScopeValue.java ! agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java ! agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java ! agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java ! agent/src/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java ! agent/src/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java ! agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java ! agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaThread.java ! src/share/vm/opto/c2compiler.cpp ! src/share/vm/prims/jvmtiEnvBase.cpp ! src/share/vm/runtime/biasedLocking.cpp ! src/share/vm/runtime/deoptimization.cpp ! src/share/vm/runtime/stackValue.cpp ! src/share/vm/runtime/stackValue.hpp ! src/share/vm/runtime/vframe.cpp ! src/share/vm/runtime/vframe.hpp ! src/share/vm/runtime/vframeArray.cpp ! src/share/vm/runtime/vframe_hp.cpp Changeset: c6386080541b Author: never Date: 2009-06-10 12:19 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/c6386080541b 6849574: VM crash using NonBlockingHashMap (high_scale_lib) Reviewed-by: kvn ! src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp ! src/share/vm/c1/c1_LIRGenerator.cpp + test/compiler/6849574/Test.java Changeset: 915cc9c5ebc6 Author: kvn Date: 2009-06-23 17:52 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/915cc9c5ebc6 6837094: False positive for "meet not symmetric" failure Summary: Have the meet not symmetric check recursively do the interface-vs-oop check on array subtypes. Reviewed-by: jrose Contributed-by: rasb...@google.com ! src/share/vm/opto/type.cpp ! src/share/vm/opto/type.hpp + test/compiler/6837094/Test.java Changeset: d1fe2c2fbdac Author: twisti Date: 2009-06-17 09:08 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/d1fe2c2fbdac 6851829: solaris build fails with 5.8 compilers Summary: Solaris builds with the CC 5.8 compilers (used for jdk6 update builds) fail while compiling adlc. Reviewed-by: never ! make/solaris/makefiles/adlc.make Changeset: e306d7c7222c Author: twisti Date: 2009-06-24 02:09 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/e306d7c7222c Merge Changeset: 14367225a853 Author: kvn Date: 2009-06-24 12:00 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/14367225a853 6841800: Incorrect boundary values behavior for option -XX:MaxLabelRootDepth=0-6 leads to jvm crash Summary: MaxLabelRootDepth value less then 10 is invalid. Reviewed-by: never ! src/share/vm/opto/matcher.cpp Changeset: 18a08a7e16b5 Author: twisti Date: 2009-06-26 07:26 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/18a08a7e16b5 5057225: Remove useless I2L conversions Summary: The optimizer should be told to normalize (AndL (ConvI2L x) 0xFF) to (ConvI2L (AndI x 0xFF)), and then the existing matcher rule will work for free. Reviewed-by: kvn ! src/cpu/sparc/vm/sparc.ad ! src/cpu/x86/vm/x86_32.ad ! src/cpu/x86/vm/x86_64.ad ! src/share/vm/opto/mulnode.cpp + test/compiler/5057225/Test5057225.java Changeset: 8f5825e0aeaa Author: never Date: 2009-06-26 13:03 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/8f5825e0aeaa 6818666: G1: Type lost in g1 pre-barrier Reviewed-by: kvn ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/graphKit.hpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/opto/parse2.cpp ! src/share/vm/opto/parse3.cpp Changeset: 3f06f139ef53 Author: never Date: 2009-06-26 16:14 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/3f06f139ef53 6851908: interpreter null check profiling broken causing extra compilation invalidation Reviewed-by: kvn ! src/cpu/x86/vm/interp_masm_x86_32.cpp ! src/cpu/x86/vm/interp_masm_x86_64.cpp Changeset: bf3489cc0aa0 Author: never Date: 2009-07-01 12:22 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/bf3489cc0aa0 6856025: assert(_base >= OopPtr && _base <= KlassPtr,"Not a Java pointer") Reviewed-by: kvn ! src/share/vm/adlc/output_h.cpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/opto/parse2.cpp ! src/share/vm/opto/parse3.cpp ! src/share/vm/opto/type.cpp ! src/share/vm/opto/type.hpp Changeset: b64314863098 Author: kvn Date: 2009-07-01 15:06 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/b64314863098 Merge Changeset: 30b9b25b9cc1 Author: tonyp Date: 2009-06-24 11:42 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/30b9b25b9cc1 6850869: G1: RSet "scrubbing" scrubs too much Summary: RSet scrubbing incorrectly deletes RSet entries that point to regions tagged as "continues humongous" due to a race when RSet scrubbing iterates over regions in parallel. Reviewed-by: apetrusenko, iveresov ! src/share/vm/gc_implementation/g1/concurrentMark.cpp Changeset: 00f7ec32f290 Author: apetrusenko Date: 2009-06-26 09:22 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/00f7ec32f290 6854027: Precompiled headers are not being updated in Linux/GCC builds Summary: Fixes incorrect handling of precompiled headers in diff mode. Reviewed-by: never, twisti ! src/share/tools/MakeDeps/Database.java Changeset: 3eb9872b10ce Author: tonyp Date: 2009-06-29 12:17 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/3eb9872b10ce 6855115: G1: Fix for 6850869 is incorrect Summary: Missed updating two variable names when improving the code for 6850869. Reviewed-by: iveresov, jmasa, ysr ! src/share/vm/gc_implementation/g1/concurrentMark.cpp Changeset: e7d5557ad624 Author: jmasa Date: 2009-07-02 16:28 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/e7d5557ad624 Merge Changeset: acba6af809c8 Author: kvn Date: 2009-07-01 20:22 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/acba6af809c8 6840775: Multiple JVM crashes seen with 1.6.0_10 through 1.6.0_14 Summary: Put missed reference to allocated array in copyOf() intrinsic into OopMap for the call slow_arraycopy(). Reviewed-by: never ! agent/src/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java ! make/solaris/makefiles/optimized.make ! src/share/vm/opto/block.cpp ! src/share/vm/opto/block.hpp ! src/share/vm/opto/buildOopMap.cpp ! src/share/vm/opto/gcm.cpp ! src/share/vm/opto/library_call.cpp Changeset: 0f2d888530e7 Author: cfang Date: 2009-07-02 16:18 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/0f2d888530e7 6855164: SIGSEGV during compilation of method involving loop over CharSequence. Summary: Don not split a block if it contains a FastLockNode with a PhiNode input. Reviewed-by: kvn, never ! src/share/vm/opto/loopopts.cpp Changeset: 73dac61fe300 Author: cfang Date: 2009-07-06 12:54 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/73dac61fe300 6857707: Add missing test case for CR 6855164 from its bug description. Summary: Add missing test case for CR 6855164 from its bug description. Reviewed-by: never + test/compiler/6855164/Test.java Changeset: 4325cdaa78ad Author: kvn Date: 2009-07-06 15:53 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/4325cdaa78ad 6857661: 64-bit server VM: assert(is_Initialize(),"invalid node class") Summary: Move the secondary raw memory barrier to the correct place in generate_arraycopy(). Reviewed-by: never ! src/share/vm/opto/library_call.cpp Changeset: f0bd02f95856 Author: kvn Date: 2009-07-07 09:54 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/f0bd02f95856 Merge Changeset: 0316eac49d5a Author: tonyp Date: 2009-07-07 14:23 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/0316eac49d5a 6855834: G1: minimize the output when -XX:+PrintHeapAtGC is set Summary: Changing the behavior of -XX:+PrintHeapAtGC for G1 from printing lengthy, per-region information to instead printing a concise summary. Reviewed-by: ysr, apetrusenko, jcoomes ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp ! src/share/vm/gc_implementation/g1/heapRegion.cpp ! src/share/vm/runtime/globals.hpp Changeset: bb18957ad21e Author: ysr Date: 2009-07-10 16:01 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/bb18957ad21e Merge Changeset: ba36394eb84b Author: xdono Date: 2009-07-02 11:10 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/ba36394eb84b Added tag jdk7-b63 for changeset 32c83fb84370 ! .hgtags Changeset: 45c4b1fe45e4 Author: trims Date: 2009-07-10 19:10 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/45c4b1fe45e4 6859411: Bump the HS16 build number to 06 Summary: Update the HS16 build number to 06 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 218f6b67f9c5 Author: trims Date: 2009-07-11 03:18 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/218f6b67f9c5 Merge Changeset: 92b5fbbe8477 Author: xdono Date: 2009-07-13 14:47 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/92b5fbbe8477 Added tag jdk7-b64 for changeset ba36394eb84b ! .hgtags Changeset: ba313800759b Author: trims Date: 2009-07-14 19:43 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/ba313800759b Merge Changeset: df6caf649ff7 Author: ysr Date: 2009-07-14 15:40 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/df6caf649ff7 6700789: G1: Enable use of compressed oops with G1 heaps Summary: Modifications to G1 so as to allow the use of compressed oops. Reviewed-by: apetrusenko, coleenp, jmasa, kvn, never, phh, tonyp ! src/cpu/sparc/vm/assembler_sparc.cpp ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/methodHandles_x86.cpp ! src/cpu/x86/vm/stubGenerator_x86_32.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp ! src/share/vm/gc_implementation/g1/concurrentMark.cpp ! src/share/vm/gc_implementation/g1/concurrentMark.hpp ! src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp ! src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/gc_implementation/g1/g1OopClosures.hpp ! src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp ! src/share/vm/gc_implementation/g1/g1RemSet.cpp ! src/share/vm/gc_implementation/g1/g1RemSet.hpp ! src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp ! src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp ! src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp ! src/share/vm/gc_implementation/g1/g1_globals.hpp ! src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp ! src/share/vm/gc_implementation/g1/heapRegion.cpp ! src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp ! src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp ! src/share/vm/gc_implementation/g1/satbQueue.cpp ! src/share/vm/gc_implementation/g1/satbQueue.hpp ! src/share/vm/gc_implementation/includeDB_gc_g1 ! src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp ! src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp ! src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp ! src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp ! src/share/vm/gc_interface/collectedHeap.hpp ! src/share/vm/includeDB_core ! src/share/vm/includeDB_features ! src/share/vm/memory/barrierSet.cpp ! src/share/vm/memory/barrierSet.hpp ! src/share/vm/memory/barrierSet.inline.hpp ! src/share/vm/memory/cardTableModRefBS.hpp ! src/share/vm/memory/genCollectedHeap.cpp ! src/share/vm/memory/genCollectedHeap.hpp ! src/share/vm/memory/genOopClosures.hpp ! src/share/vm/memory/genOopClosures.inline.hpp ! src/share/vm/memory/referenceProcessor.cpp ! src/share/vm/memory/space.hpp ! src/share/vm/memory/universe.cpp ! src/share/vm/memory/universe.hpp ! src/share/vm/oops/instanceRefKlass.cpp ! src/share/vm/oops/objArrayKlass.cpp ! src/share/vm/oops/oop.inline.hpp ! src/share/vm/oops/oopsHierarchy.hpp ! src/share/vm/opto/cfgnode.cpp ! src/share/vm/prims/unsafe.cpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/safepoint.cpp ! src/share/vm/runtime/sharedRuntime.cpp ! src/share/vm/utilities/taskqueue.cpp ! src/share/vm/utilities/taskqueue.hpp Changeset: 42d84bbbecf4 Author: tonyp Date: 2009-07-15 12:22 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/42d84bbbecf4 6859911: G1: assert(Heap_lock->owner() = NULL, "Should be owned on this thread's behalf") Summary: The used() method assumes that the heap lock is held when it is called. However, when used() is called from print_on(), this is not the case. Reviewed-by: ysr, jmasa ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Changeset: f0a1cbbaf3c0 Author: ysr Date: 2009-07-16 12:38 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/f0a1cbbaf3c0 Merge Changeset: fe95187e8882 Author: never Date: 2009-07-13 14:58 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/fe95187e8882 6859338: amd64 native unverified entry point pushes values before implicit null check Reviewed-by: kvn, twisti ! src/cpu/x86/vm/sharedRuntime_x86_64.cpp + test/compiler/6859338/Test6859338.java Changeset: 83906a156fc0 Author: never Date: 2009-07-13 15:00 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/83906a156fc0 Merge Changeset: fd50a67f97d1 Author: never Date: 2009-07-15 13:37 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/fd50a67f97d1 6860469: remix_address_expressions sets incorrect control causing crash in split_if_with_block_post Reviewed-by: never, kvn Contributed-by: yamau...@google.com, rasb...@google.com ! src/share/vm/opto/loopopts.cpp + test/compiler/6860469/Test.java Changeset: fc4be448891f Author: kvn Date: 2009-07-16 14:10 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/fc4be448891f 6851742: (EA) allocation elimination doesn't work with UseG1GC Summary: Fix eliminate_card_mark() to eliminate G1 pre/post barriers. Reviewed-by: never ! src/share/vm/opto/escape.cpp ! 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/ifnode.cpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/opto/machnode.cpp ! src/share/vm/opto/macro.cpp ! src/share/vm/opto/matcher.cpp ! src/share/vm/opto/phaseX.hpp ! src/share/vm/opto/type.hpp Changeset: 84770322b304 Author: never Date: 2009-07-16 17:59 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/84770322b304 6861513: correct copyright attribution in test for 6837094 and 6860469 Reviewed-by: rasbold ! test/compiler/6837094/Test.java ! test/compiler/6860469/Test.java Changeset: 64219d2a6493 Author: kvn Date: 2009-07-16 16:29 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/64219d2a6493 6851282: JIT miscompilation results in null entry in array when using CompressedOops Summary: Get type for new Phi from non dead path. Reviewed-by: never ! src/share/vm/opto/cfgnode.cpp + test/compiler/6851282/Test.java Changeset: 606c988ff684 Author: kvn Date: 2009-07-17 00:50 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/606c988ff684 Merge Changeset: f9094a5e1c8a Author: never Date: 2009-07-21 16:42 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/f9094a5e1c8a 6857159: local schedule failed with checkcast of Thread.currentThread() Reviewed-by: kvn ! src/share/vm/adlc/formssel.cpp ! src/share/vm/adlc/formssel.hpp + test/compiler/6857159/Test6857159.java + test/compiler/6857159/Test6857159.sh Changeset: 75596850f863 Author: jrose Date: 2009-07-21 16:56 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/75596850f863 6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics Summary: remove useless lazy evaluation of intrinsics; add LAST_COMPILER_INLINE to help categorize them Reviewed-by: kvn ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/interpreter/rewriter.cpp ! src/share/vm/oops/methodKlass.cpp ! src/share/vm/oops/methodOop.cpp ! src/share/vm/oops/methodOop.hpp ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/library_call.cpp Changeset: 17173cb6e48d Author: jrose Date: 2009-07-21 21:33 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/17173cb6e48d Merge Changeset: 5314d85ffd54 Author: kvn Date: 2009-07-22 15:48 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/5314d85ffd54 6826736: CMS: core dump with -XX:+UseCompressedOops Summary: Fix deoptimization code and OopMapSet::all_do() to check for oop = narrow_oop_base. Reviewed-by: jcoomes, phh, ysr, never ! src/share/vm/compiler/oopMap.cpp ! src/share/vm/compiler/oopMap.hpp ! src/share/vm/memory/universe.hpp ! src/share/vm/runtime/stackValue.cpp + test/compiler/6826736/Test.java Changeset: ea3f9723b5cf Author: kvn Date: 2009-07-23 14:53 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/ea3f9723b5cf 6860599: nodes limit could be reached during Output phase Summary: Bailout compilation if nodes limit could be reached during Output phase. Reviewed-by: never, twisti ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/compile.hpp ! src/share/vm/opto/output.cpp Changeset: 433f394ab509 Author: kvn Date: 2009-07-24 09:01 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/433f394ab509 Merge ! src/share/vm/memory/universe.hpp ! src/share/vm/opto/cfgnode.cpp Changeset: 45d97a99715b Author: apetrusenko Date: 2009-07-22 02:46 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/45d97a99715b 6862661: G1: _gc_alloc_region_counts is not updated properly after 6604422 Summary: Implementation of RFE 6604422 (G1: re-use half-promoted regions) introduced incorrect _gc_alloc_region_counts updates which effectively disabled survivor spaces. Reviewed-by: johnc, jmasa, tonyp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Changeset: 36b5611220a7 Author: ysr Date: 2009-07-22 18:25 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/36b5611220a7 6863216: Clean up debugging debris inadvertently pushed with 6700789 Summary: Anti-delta for debugging debris that was inadvertently pushed. Reviewed-by: kvn, tonyp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/opto/cfgnode.cpp Changeset: 0a83664f978b Author: ysr Date: 2009-07-24 12:49 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/0a83664f978b Merge ! src/share/vm/opto/cfgnode.cpp Changeset: 494244ae0171 Author: coleenp Date: 2009-07-27 17:23 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/494244ae0171 Merge ! src/share/vm/classfile/classFileParser.cpp ! src/share/vm/includeDB_core ! src/share/vm/oops/objArrayKlass.cpp