changeset 6760:5f54277c67f7 hs25-b02

Merge
author amurillo
date Fri, 21 Sep 2012 14:02:57 -0700
parents da0d652d0c2f (diff) 145ffab733e7 (current diff)
children 6bb378c50828
files .hgtags agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/ci/ciKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSPermGen.java agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGen.java agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGenGen.java agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGen.java agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGenGen.java agent/src/share/classes/sun/jvm/hotspot/memory/ContigPermSpace.java agent/src/share/classes/sun/jvm/hotspot/memory/PermGen.java agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/CompiledICHolderKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethodKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/KlassKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/MethodDataKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/MethodKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlassKlass.java agent/src/share/classes/sun/jvm/hotspot/ui/tree/BadOopTreeNodeAdapter.java make/solaris/makefiles/reorder_COMPILER1_amd64 make/solaris/makefiles/reorder_COMPILER1_i486 make/solaris/makefiles/reorder_COMPILER1_sparc make/solaris/makefiles/reorder_COMPILER1_sparcv9 make/solaris/makefiles/reorder_COMPILER2_amd64 make/solaris/makefiles/reorder_COMPILER2_i486 make/solaris/makefiles/reorder_COMPILER2_sparc make/solaris/makefiles/reorder_COMPILER2_sparcv9 make/solaris/makefiles/reorder_CORE_i486 make/solaris/makefiles/reorder_CORE_sparc make/solaris/makefiles/reorder_CORE_sparcv9 make/solaris/makefiles/reorder_TIERED_amd64 make/solaris/makefiles/reorder_TIERED_i486 make/solaris/makefiles/reorder_TIERED_sparc make/solaris/makefiles/reorder_TIERED_sparcv9 make/solaris/reorder.sh src/cpu/sparc/vm/dump_sparc.cpp src/cpu/x86/vm/dump_x86_32.cpp src/cpu/x86/vm/dump_x86_64.cpp src/cpu/zero/vm/dump_zero.cpp src/share/vm/ci/ciArrayKlassKlass.hpp src/share/vm/ci/ciCPCache.cpp src/share/vm/ci/ciCPCache.hpp src/share/vm/ci/ciInstanceKlassKlass.cpp src/share/vm/ci/ciInstanceKlassKlass.hpp src/share/vm/ci/ciKlassKlass.cpp src/share/vm/ci/ciKlassKlass.hpp src/share/vm/ci/ciMethodKlass.cpp src/share/vm/ci/ciMethodKlass.hpp src/share/vm/ci/ciObjArrayKlassKlass.cpp src/share/vm/ci/ciObjArrayKlassKlass.hpp src/share/vm/ci/ciTypeArrayKlassKlass.cpp src/share/vm/ci/ciTypeArrayKlassKlass.hpp src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp src/share/vm/memory/classify.cpp src/share/vm/memory/classify.hpp src/share/vm/memory/compactPermGen.hpp src/share/vm/memory/compactingPermGenGen.cpp src/share/vm/memory/compactingPermGenGen.hpp src/share/vm/memory/dump.cpp src/share/vm/memory/permGen.cpp src/share/vm/memory/permGen.hpp src/share/vm/memory/restore.cpp src/share/vm/memory/serialize.cpp src/share/vm/oops/arrayKlassKlass.cpp src/share/vm/oops/arrayKlassKlass.hpp src/share/vm/oops/compiledICHolderKlass.cpp src/share/vm/oops/compiledICHolderKlass.hpp src/share/vm/oops/compiledICHolderOop.cpp src/share/vm/oops/compiledICHolderOop.hpp src/share/vm/oops/constMethodKlass.cpp src/share/vm/oops/constMethodKlass.hpp src/share/vm/oops/constMethodOop.cpp src/share/vm/oops/constMethodOop.hpp src/share/vm/oops/constantPoolKlass.cpp src/share/vm/oops/constantPoolKlass.hpp src/share/vm/oops/constantPoolOop.cpp src/share/vm/oops/constantPoolOop.hpp src/share/vm/oops/cpCacheKlass.cpp src/share/vm/oops/cpCacheKlass.hpp src/share/vm/oops/cpCacheOop.cpp src/share/vm/oops/cpCacheOop.hpp src/share/vm/oops/instanceKlassKlass.cpp src/share/vm/oops/instanceKlassKlass.hpp src/share/vm/oops/klassKlass.cpp src/share/vm/oops/klassKlass.hpp src/share/vm/oops/klassOop.cpp src/share/vm/oops/klassOop.hpp src/share/vm/oops/methodDataKlass.cpp src/share/vm/oops/methodDataKlass.hpp src/share/vm/oops/methodDataOop.cpp src/share/vm/oops/methodDataOop.hpp src/share/vm/oops/methodKlass.cpp src/share/vm/oops/methodKlass.hpp src/share/vm/oops/methodOop.cpp src/share/vm/oops/methodOop.hpp src/share/vm/oops/objArrayKlassKlass.cpp src/share/vm/oops/objArrayKlassKlass.hpp src/share/vm/oops/typeArrayKlassKlass.cpp src/share/vm/oops/typeArrayKlassKlass.hpp
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Sep 20 16:27:51 2012 -0700
+++ b/.hgtags	Fri Sep 21 14:02:57 2012 -0700
@@ -277,3 +277,4 @@
 af0c8a0808516317333dcf9af15567cdd52761ce jdk8-b55
 6124ff4218296c91e4a72f1a76c064892d39d61b jdk8-b56
 9b076bc3ab67d42d1d02144ef8dcd6006a7fc0d6 hs25-b01
+d70102c4cb73158902acaa6016f47c7bc14e0d67 jdk8-b57