Mercurial > hg > graal-jvmci-8
changeset 6746:9b076bc3ab67 hs25-b01
Merge
author | amurillo |
---|---|
date | Fri, 14 Sep 2012 21:50:58 -0700 |
parents | d70102c4cb73 (diff) 6dfc6a541338 (current diff) |
children | 80e4129f0e28 |
files | 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, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Sep 14 12:55:50 2012 -0400 +++ b/.hgtags Fri Sep 14 21:50:58 2012 -0700 @@ -274,3 +274,5 @@ 9e3ae661284dc04185b029d85440fe7811f1ed07 hs24-b21 e8fb566b94667f88462164defa654203f0ab6820 jdk8-b54 09ea7e0752b306b8ae74713aeb4eb6263e1c6836 hs24-b22 +af0c8a0808516317333dcf9af15567cdd52761ce jdk8-b55 +6124ff4218296c91e4a72f1a76c064892d39d61b jdk8-b56