Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Tue, 09 Oct 2012 07:41:27 +0200
- author
- rbackman
- date
- Tue, 09 Oct 2012 07:41:27 +0200
- changeset 4151
- 6e5a59a8e4a7
- parent 4141
- 81e878c53615
- parent 4150
- 0e8ca886e4e1
- child 4152
- 26351ce8c4b0
Merge
1.1 --- a/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java Fri Oct 05 13:37:08 2012 -0700 1.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java Tue Oct 09 07:41:27 2012 +0200 1.3 @@ -44,7 +44,7 @@ 1.4 } 1.5 1.6 private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { 1.7 - Type type = db.lookupType("arrayKlass"); 1.8 + Type type = db.lookupType("ArrayKlass"); 1.9 dimension = new CIntField(type.getCIntegerField("_dimension"), 0); 1.10 higherDimension = new MetadataField(type.getAddressField("_higher_dimension"), 0); 1.11 lowerDimension = new MetadataField(type.getAddressField("_lower_dimension"), 0);
2.1 --- a/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java Fri Oct 05 13:37:08 2012 -0700 2.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java Tue Oct 09 07:41:27 2012 +0200 2.3 @@ -188,11 +188,11 @@ 2.4 public Klass arrayKlassOrNull() { return arrayKlassImpl(true); } 2.5 2.6 public Klass arrayKlassImpl(boolean orNull, int rank) { 2.7 - throw new RuntimeException("array_klass should be dispatched to InstanceKlass, objArrayKlass or typeArrayKlass"); 2.8 + throw new RuntimeException("array_klass should be dispatched to InstanceKlass, ObjArrayKlass or TypeArrayKlass"); 2.9 } 2.10 2.11 public Klass arrayKlassImpl(boolean orNull) { 2.12 - throw new RuntimeException("array_klass should be dispatched to InstanceKlass, objArrayKlass or typeArrayKlass"); 2.13 + throw new RuntimeException("array_klass should be dispatched to InstanceKlass, ObjArrayKlass or TypeArrayKlass"); 2.14 } 2.15 2.16 // This returns the name in the form java/lang/String which isn't really a signature
3.1 --- a/agent/src/share/classes/sun/jvm/hotspot/oops/Metadata.java Fri Oct 05 13:37:08 2012 -0700 3.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/oops/Metadata.java Tue Oct 09 07:41:27 2012 +0200 3.3 @@ -55,8 +55,8 @@ 3.4 metadataConstructor.addMapping("InstanceMirrorKlass", InstanceMirrorKlass.class); 3.5 metadataConstructor.addMapping("InstanceRefKlass", InstanceRefKlass.class); 3.6 metadataConstructor.addMapping("InstanceClassLoaderKlass", InstanceClassLoaderKlass.class); 3.7 - metadataConstructor.addMapping("typeArrayKlass", TypeArrayKlass.class); 3.8 - metadataConstructor.addMapping("objArrayKlass", ObjArrayKlass.class); 3.9 + metadataConstructor.addMapping("TypeArrayKlass", TypeArrayKlass.class); 3.10 + metadataConstructor.addMapping("ObjArrayKlass", ObjArrayKlass.class); 3.11 metadataConstructor.addMapping("Method", Method.class); 3.12 metadataConstructor.addMapping("MethodData", MethodData.class); 3.13 metadataConstructor.addMapping("ConstMethod", ConstMethod.class);
4.1 --- a/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java Fri Oct 05 13:37:08 2012 -0700 4.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java Tue Oct 09 07:41:27 2012 +0200 4.3 @@ -43,7 +43,7 @@ 4.4 } 4.5 4.6 private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { 4.7 - Type type = db.lookupType("objArrayKlass"); 4.8 + Type type = db.lookupType("ObjArrayKlass"); 4.9 elementKlass = new MetadataField(type.getAddressField("_element_klass"), 0); 4.10 bottomKlass = new MetadataField(type.getAddressField("_bottom_klass"), 0); 4.11 }
5.1 --- a/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java Fri Oct 05 13:37:08 2012 -0700 5.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java Tue Oct 09 07:41:27 2012 +0200 5.3 @@ -31,7 +31,7 @@ 5.4 import sun.jvm.hotspot.types.*; 5.5 import sun.jvm.hotspot.utilities.*; 5.6 5.7 -// TypeArrayKlass is a proxy for typeArrayKlass in the JVM 5.8 +// TypeArrayKlass is a proxy for TypeArrayKlass in the JVM 5.9 5.10 public class TypeArrayKlass extends ArrayKlass { 5.11 static { 5.12 @@ -43,7 +43,7 @@ 5.13 } 5.14 5.15 private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { 5.16 - Type t = db.lookupType("typeArrayKlass"); 5.17 + Type t = db.lookupType("TypeArrayKlass"); 5.18 maxLength = new CIntField(t.getCIntegerField("_max_length"), 0); 5.19 } 5.20
6.1 --- a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java Fri Oct 05 13:37:08 2012 -0700 6.2 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java Tue Oct 09 07:41:27 2012 +0200 6.3 @@ -354,15 +354,14 @@ 6.4 } 6.5 6.6 protected void writeFields() throws IOException { 6.7 - U2Array fields = klass.getFields(); 6.8 - final int length = (int) fields.length(); 6.9 + final int javaFieldsCount = klass.getJavaFieldsCount(); 6.10 6.11 // write number of fields 6.12 - dos.writeShort((short) length); 6.13 + dos.writeShort((short) javaFieldsCount); 6.14 6.15 - if (DEBUG) debugMessage("number of fields = " + length); 6.16 + if (DEBUG) debugMessage("number of fields = " + javaFieldsCount); 6.17 6.18 - for (int index = 0; index < length; index++) { 6.19 + for (int index = 0; index < javaFieldsCount; index++) { 6.20 short accessFlags = klass.getFieldAccessFlags(index); 6.21 dos.writeShort(accessFlags & (short) JVM_RECOGNIZED_FIELD_MODIFIERS); 6.22
7.1 --- a/agent/src/share/native/sadis.c Fri Oct 05 13:37:08 2012 -0700 7.2 +++ b/agent/src/share/native/sadis.c Tue Oct 09 07:41:27 2012 +0200 7.3 @@ -46,7 +46,7 @@ 7.4 7.5 #else 7.6 7.7 -#include <strings.h> 7.8 +#include <string.h> 7.9 #include <dlfcn.h> 7.10 #include <link.h> 7.11
8.1 --- a/make/bsd/makefiles/buildtree.make Fri Oct 05 13:37:08 2012 -0700 8.2 +++ b/make/bsd/makefiles/buildtree.make Tue Oct 09 07:41:27 2012 +0200 8.3 @@ -163,6 +163,13 @@ 8.4 endif 8.5 endif 8.6 8.7 +# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK 8.8 +ifndef OPENJDK 8.9 + ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) 8.10 + OPENJDK=true 8.11 + endif 8.12 +endif 8.13 + 8.14 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 8.15 8.16 BUILDTREE = \ 8.17 @@ -205,6 +212,7 @@ 8.18 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 8.19 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 8.20 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 8.21 + echo "OPENJDK = $(OPENJDK)"; \ 8.22 echo; \ 8.23 echo "# Used for platform dispatching"; \ 8.24 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
9.1 --- a/make/linux/makefiles/buildtree.make Fri Oct 05 13:37:08 2012 -0700 9.2 +++ b/make/linux/makefiles/buildtree.make Tue Oct 09 07:41:27 2012 +0200 9.3 @@ -156,6 +156,13 @@ 9.4 endif 9.5 endif 9.6 9.7 +# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK 9.8 +ifndef OPENJDK 9.9 + ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) 9.10 + OPENJDK=true 9.11 + endif 9.12 +endif 9.13 + 9.14 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 9.15 9.16 BUILDTREE = \ 9.17 @@ -198,6 +205,7 @@ 9.18 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 9.19 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 9.20 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 9.21 + echo "OPENJDK = $(OPENJDK)"; \ 9.22 echo; \ 9.23 echo "# Used for platform dispatching"; \ 9.24 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
10.1 --- a/make/linux/makefiles/dtrace.make Fri Oct 05 13:37:08 2012 -0700 10.2 +++ b/make/linux/makefiles/dtrace.make Tue Oct 09 07:41:27 2012 +0200 10.3 @@ -1,5 +1,6 @@ 10.4 # 10.5 -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. 10.6 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. 10.7 +# Copyright (c) 2012 Red Hat, Inc. 10.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 10.9 # 10.10 # This code is free software; you can redistribute it and/or modify it 10.11 @@ -25,3 +26,40 @@ 10.12 # Linux does not build jvm_db 10.13 LIBJVM_DB = 10.14 10.15 +# Only OPENJDK builds test and support SDT probes currently. 10.16 +ifndef OPENJDK 10.17 +REASON = "This JDK does not support SDT probes" 10.18 +else 10.19 + 10.20 +# We need a recent GCC for the default 10.21 +ifeq "$(shell expr \( $(CC_VER_MAJOR) \>= 4 \) \& \( $(CC_VER_MINOR) \>= 4 \) )" "0" 10.22 +REASON = "gcc version is too old" 10.23 +else 10.24 + 10.25 +# But it does have a SystemTap dtrace compatible sys/sdt.h 10.26 +ifneq ($(ALT_SDT_H),) 10.27 + SDT_H_FILE = $(ALT_SDT_H) 10.28 +else 10.29 + SDT_H_FILE = /usr/include/sys/sdt.h 10.30 +endif 10.31 +DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE)) 10.32 +REASON = "$(SDT_H_FILE) not found" 10.33 + 10.34 +ifneq ($(DTRACE_ENABLED),) 10.35 + CFLAGS += -DDTRACE_ENABLED 10.36 +endif 10.37 + 10.38 +endif 10.39 +endif 10.40 + 10.41 +# Phony target used in vm.make build target to check whether enabled. 10.42 +.PHONY: dtraceCheck 10.43 +ifeq ($(DTRACE_ENABLED),) 10.44 +dtraceCheck: 10.45 + $(QUIETLY) echo "**NOTICE** Dtrace support disabled: $(REASON)" 10.46 +else 10.47 +dtraceCheck: 10.48 +endif 10.49 + 10.50 +# It doesn't support HAVE_DTRACE_H though. 10.51 +
11.1 --- a/make/linux/makefiles/vm.make Fri Oct 05 13:37:08 2012 -0700 11.2 +++ b/make/linux/makefiles/vm.make Tue Oct 09 07:41:27 2012 +0200 11.3 @@ -387,7 +387,7 @@ 11.4 11.5 #---------------------------------------------------------------------- 11.6 11.7 -build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) $(WB_JAR) 11.8 +build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) dtraceCheck $(WB_JAR) 11.9 11.10 install: install_jvm install_jsig install_saproc 11.11
12.1 --- a/make/solaris/makefiles/buildtree.make Fri Oct 05 13:37:08 2012 -0700 12.2 +++ b/make/solaris/makefiles/buildtree.make Tue Oct 09 07:41:27 2012 +0200 12.3 @@ -148,6 +148,13 @@ 12.4 endif 12.5 endif 12.6 12.7 +# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK 12.8 +ifndef OPENJDK 12.9 + ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) 12.10 + OPENJDK=true 12.11 + endif 12.12 +endif 12.13 + 12.14 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 12.15 12.16 BUILDTREE = \ 12.17 @@ -190,6 +197,7 @@ 12.18 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 12.19 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 12.20 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 12.21 + echo "OPENJDK = $(OPENJDK)"; \ 12.22 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 12.23 echo; \ 12.24 echo "# Used for platform dispatching"; \
13.1 --- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp Fri Oct 05 13:37:08 2012 -0700 13.2 +++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp Tue Oct 09 07:41:27 2012 +0200 13.3 @@ -2290,7 +2290,7 @@ 13.4 __ mov(length, len); 13.5 __ load_klass(dst, tmp); 13.6 13.7 - int ek_offset = in_bytes(objArrayKlass::element_klass_offset()); 13.8 + int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset()); 13.9 __ ld_ptr(tmp, ek_offset, super_k); 13.10 13.11 int sco_offset = in_bytes(Klass::super_check_offset_offset()); 13.12 @@ -2781,7 +2781,7 @@ 13.13 __ load_klass(value, klass_RInfo); 13.14 13.15 // get instance klass 13.16 - __ ld_ptr(Address(k_RInfo, objArrayKlass::element_klass_offset()), k_RInfo); 13.17 + __ ld_ptr(Address(k_RInfo, ObjArrayKlass::element_klass_offset()), k_RInfo); 13.18 // perform the fast part of the checking logic 13.19 __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, O7, success_target, failure_target, NULL); 13.20
14.1 --- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp Fri Oct 05 13:37:08 2012 -0700 14.2 +++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp Tue Oct 09 07:41:27 2012 +0200 14.3 @@ -3091,7 +3091,7 @@ 14.4 arraycopy_range_checks(src, src_pos, dst, dst_pos, length, 14.5 O5_temp, G4_dst_klass, L_failed); 14.6 14.7 - // typeArrayKlass 14.8 + // TypeArrayKlass 14.9 // 14.10 // src_addr = (src + array_header_in_bytes()) + (src_pos << log2elemsize); 14.11 // dst_addr = (dst + array_header_in_bytes()) + (dst_pos << log2elemsize); 14.12 @@ -3142,7 +3142,7 @@ 14.13 __ br(Assembler::always, false, Assembler::pt, entry_jlong_arraycopy); 14.14 __ delayed()->signx(length, count); // length 14.15 14.16 - // objArrayKlass 14.17 + // ObjArrayKlass 14.18 __ BIND(L_objArray); 14.19 // live at this point: G3_src_klass, G4_dst_klass, src[_pos], dst[_pos], length 14.20 14.21 @@ -3198,8 +3198,8 @@ 14.22 generate_type_check(G3_src_klass, sco_temp, G4_dst_klass, 14.23 O5_temp, L_plain_copy); 14.24 14.25 - // Fetch destination element klass from the objArrayKlass header. 14.26 - int ek_offset = in_bytes(objArrayKlass::element_klass_offset()); 14.27 + // Fetch destination element klass from the ObjArrayKlass header. 14.28 + int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset()); 14.29 14.30 // the checkcast_copy loop needs two extra arguments: 14.31 __ ld_ptr(G4_dst_klass, ek_offset, O4); // dest elem klass
15.1 --- a/src/cpu/sparc/vm/templateTable_sparc.cpp Fri Oct 05 13:37:08 2012 -0700 15.2 +++ b/src/cpu/sparc/vm/templateTable_sparc.cpp Tue Oct 09 07:41:27 2012 +0200 15.3 @@ -867,7 +867,7 @@ 15.4 15.5 // do fast instanceof cache test 15.6 15.7 - __ ld_ptr(O4, in_bytes(objArrayKlass::element_klass_offset()), O4); 15.8 + __ ld_ptr(O4, in_bytes(ObjArrayKlass::element_klass_offset()), O4); 15.9 15.10 assert(Otos_i == O0, "just checking"); 15.11
16.1 --- a/src/cpu/x86/vm/assembler_x86.cpp Fri Oct 05 13:37:08 2012 -0700 16.2 +++ b/src/cpu/x86/vm/assembler_x86.cpp Tue Oct 09 07:41:27 2012 +0200 16.3 @@ -1170,26 +1170,11 @@ 16.4 // and stores reg into adr if so; otherwise, the value at adr is loaded into rax,. 16.5 // The ZF is set if the compared values were equal, and cleared otherwise. 16.6 void Assembler::cmpxchgl(Register reg, Address adr) { // cmpxchg 16.7 - if (Atomics & 2) { 16.8 - // caveat: no instructionmark, so this isn't relocatable. 16.9 - // Emit a synthetic, non-atomic, CAS equivalent. 16.10 - // Beware. The synthetic form sets all ICCs, not just ZF. 16.11 - // cmpxchg r,[m] is equivalent to rax, = CAS (m, rax, r) 16.12 - cmpl(rax, adr); 16.13 - movl(rax, adr); 16.14 - if (reg != rax) { 16.15 - Label L ; 16.16 - jcc(Assembler::notEqual, L); 16.17 - movl(adr, reg); 16.18 - bind(L); 16.19 - } 16.20 - } else { 16.21 - InstructionMark im(this); 16.22 - prefix(adr, reg); 16.23 - emit_byte(0x0F); 16.24 - emit_byte(0xB1); 16.25 - emit_operand(reg, adr); 16.26 - } 16.27 + InstructionMark im(this); 16.28 + prefix(adr, reg); 16.29 + emit_byte(0x0F); 16.30 + emit_byte(0xB1); 16.31 + emit_operand(reg, adr); 16.32 } 16.33 16.34 void Assembler::comisd(XMMRegister dst, Address src) { 16.35 @@ -1513,12 +1498,7 @@ 16.36 } 16.37 16.38 void Assembler::lock() { 16.39 - if (Atomics & 1) { 16.40 - // Emit either nothing, a NOP, or a NOP: prefix 16.41 - emit_byte(0x90) ; 16.42 - } else { 16.43 - emit_byte(0xF0); 16.44 - } 16.45 + emit_byte(0xF0); 16.46 } 16.47 16.48 void Assembler::lzcntl(Register dst, Register src) { 16.49 @@ -10616,7 +10596,7 @@ 16.50 // Array header size is 12 bytes in 32-bit VM 16.51 // + 6 bytes for 3 chars == 18 bytes, 16.52 // enough space to load vec and shift. 16.53 - assert(HeapWordSize*typeArrayKlass::header_size() >= 12,"sanity"); 16.54 + assert(HeapWordSize*TypeArrayKlass::header_size() >= 12,"sanity"); 16.55 movdqu(vec, Address(str2, (int_cnt2*2)-16)); 16.56 psrldq(vec, 16-(int_cnt2*2)); 16.57 }
17.1 --- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Fri Oct 05 13:37:08 2012 -0700 17.2 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Tue Oct 09 07:41:27 2012 +0200 17.3 @@ -1881,7 +1881,7 @@ 17.4 __ load_klass(klass_RInfo, value); 17.5 17.6 // get instance klass (it's already uncompressed) 17.7 - __ movptr(k_RInfo, Address(k_RInfo, objArrayKlass::element_klass_offset())); 17.8 + __ movptr(k_RInfo, Address(k_RInfo, ObjArrayKlass::element_klass_offset())); 17.9 // perform the fast part of the checking logic 17.10 __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, NULL); 17.11 // call out-of-line instance of __ check_klass_subtype_slow_path(...): 17.12 @@ -3349,7 +3349,7 @@ 17.13 17.14 #ifndef _LP64 17.15 __ movptr(tmp, dst_klass_addr); 17.16 - __ movptr(tmp, Address(tmp, objArrayKlass::element_klass_offset())); 17.17 + __ movptr(tmp, Address(tmp, ObjArrayKlass::element_klass_offset())); 17.18 __ push(tmp); 17.19 __ movl(tmp, Address(tmp, Klass::super_check_offset_offset())); 17.20 __ push(tmp); 17.21 @@ -3375,14 +3375,14 @@ 17.22 // Allocate abi space for args but be sure to keep stack aligned 17.23 __ subptr(rsp, 6*wordSize); 17.24 __ load_klass(c_rarg3, dst); 17.25 - __ movptr(c_rarg3, Address(c_rarg3, objArrayKlass::element_klass_offset())); 17.26 + __ movptr(c_rarg3, Address(c_rarg3, ObjArrayKlass::element_klass_offset())); 17.27 store_parameter(c_rarg3, 4); 17.28 __ movl(c_rarg3, Address(c_rarg3, Klass::super_check_offset_offset())); 17.29 __ call(RuntimeAddress(copyfunc_addr)); 17.30 __ addptr(rsp, 6*wordSize); 17.31 #else 17.32 __ load_klass(c_rarg4, dst); 17.33 - __ movptr(c_rarg4, Address(c_rarg4, objArrayKlass::element_klass_offset())); 17.34 + __ movptr(c_rarg4, Address(c_rarg4, ObjArrayKlass::element_klass_offset())); 17.35 __ movl(c_rarg3, Address(c_rarg4, Klass::super_check_offset_offset())); 17.36 __ call(RuntimeAddress(copyfunc_addr)); 17.37 #endif
18.1 --- a/src/cpu/x86/vm/stubGenerator_x86_32.cpp Fri Oct 05 13:37:08 2012 -0700 18.2 +++ b/src/cpu/x86/vm/stubGenerator_x86_32.cpp Tue Oct 09 07:41:27 2012 +0200 18.3 @@ -1801,7 +1801,7 @@ 18.4 assert_different_registers(src, src_pos, dst, dst_pos, rcx_lh); 18.5 arraycopy_range_checks(src, src_pos, dst, dst_pos, LENGTH, L_failed); 18.6 18.7 - // typeArrayKlass 18.8 + // TypeArrayKlass 18.9 // 18.10 // src_addr = (src + array_header_in_bytes()) + (src_pos << log2elemsize); 18.11 // dst_addr = (dst + array_header_in_bytes()) + (dst_pos << log2elemsize); 18.12 @@ -1864,7 +1864,7 @@ 18.13 __ leave(); // required for proper stackwalking of RuntimeStub frame 18.14 __ ret(0); 18.15 18.16 - // objArrayKlass 18.17 + // ObjArrayKlass 18.18 __ BIND(L_objArray); 18.19 // live at this point: rcx_src_klass, src[_pos], dst[_pos] 18.20 18.21 @@ -1894,7 +1894,7 @@ 18.22 // live at this point: rcx_src_klass, dst[_pos], src[_pos] 18.23 { 18.24 // Handy offsets: 18.25 - int ek_offset = in_bytes(objArrayKlass::element_klass_offset()); 18.26 + int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset()); 18.27 int sco_offset = in_bytes(Klass::super_check_offset_offset()); 18.28 18.29 Register rsi_dst_klass = rsi;
19.1 --- a/src/cpu/x86/vm/stubGenerator_x86_64.cpp Fri Oct 05 13:37:08 2012 -0700 19.2 +++ b/src/cpu/x86/vm/stubGenerator_x86_64.cpp Tue Oct 09 07:41:27 2012 +0200 19.3 @@ -2604,7 +2604,7 @@ 19.4 arraycopy_range_checks(src, src_pos, dst, dst_pos, r11_length, 19.5 r10, L_failed); 19.6 19.7 - // typeArrayKlass 19.8 + // TypeArrayKlass 19.9 // 19.10 // src_addr = (src + array_header_in_bytes()) + (src_pos << log2elemsize); 19.11 // dst_addr = (dst + array_header_in_bytes()) + (dst_pos << log2elemsize); 19.12 @@ -2670,7 +2670,7 @@ 19.13 __ movl2ptr(count, r11_length); // length 19.14 __ jump(RuntimeAddress(long_copy_entry)); 19.15 19.16 - // objArrayKlass 19.17 + // ObjArrayKlass 19.18 __ BIND(L_objArray); 19.19 // live at this point: r10_src_klass, r11_length, src[_pos], dst[_pos] 19.20 19.21 @@ -2723,8 +2723,8 @@ 19.22 assert_clean_int(sco_temp, rax); 19.23 generate_type_check(r10_src_klass, sco_temp, r11_dst_klass, L_plain_copy); 19.24 19.25 - // Fetch destination element klass from the objArrayKlass header. 19.26 - int ek_offset = in_bytes(objArrayKlass::element_klass_offset()); 19.27 + // Fetch destination element klass from the ObjArrayKlass header. 19.28 + int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset()); 19.29 __ movptr(r11_dst_klass, Address(r11_dst_klass, ek_offset)); 19.30 __ movl( sco_temp, Address(r11_dst_klass, sco_offset)); 19.31 assert_clean_int(sco_temp, rax);
20.1 --- a/src/cpu/x86/vm/templateTable_x86_32.cpp Fri Oct 05 13:37:08 2012 -0700 20.2 +++ b/src/cpu/x86/vm/templateTable_x86_32.cpp Tue Oct 09 07:41:27 2012 +0200 20.3 @@ -949,7 +949,7 @@ 20.4 __ load_klass(rbx, rax); 20.5 // Move superklass into EAX 20.6 __ load_klass(rax, rdx); 20.7 - __ movptr(rax, Address(rax, objArrayKlass::element_klass_offset())); 20.8 + __ movptr(rax, Address(rax, ObjArrayKlass::element_klass_offset())); 20.9 // Compress array+index*wordSize+12 into a single register. Frees ECX. 20.10 __ lea(rdx, element_address); 20.11
21.1 --- a/src/cpu/x86/vm/templateTable_x86_64.cpp Fri Oct 05 13:37:08 2012 -0700 21.2 +++ b/src/cpu/x86/vm/templateTable_x86_64.cpp Tue Oct 09 07:41:27 2012 +0200 21.3 @@ -970,7 +970,7 @@ 21.4 // Move superklass into rax 21.5 __ load_klass(rax, rdx); 21.6 __ movptr(rax, Address(rax, 21.7 - objArrayKlass::element_klass_offset())); 21.8 + ObjArrayKlass::element_klass_offset())); 21.9 // Compress array + index*oopSize + 12 into a single register. Frees rcx. 21.10 __ lea(rdx, element_address); 21.11
22.1 --- a/src/cpu/x86/vm/x86_32.ad Fri Oct 05 13:37:08 2012 -0700 22.2 +++ b/src/cpu/x86/vm/x86_32.ad Tue Oct 09 07:41:27 2012 +0200 22.3 @@ -12145,8 +12145,8 @@ 22.4 22.5 ins_cost(1100); // slightly larger than the next version 22.6 format %{ "MOV EDI,[$sub+Klass::secondary_supers]\n\t" 22.7 - "MOV ECX,[EDI+arrayKlass::length]\t# length to scan\n\t" 22.8 - "ADD EDI,arrayKlass::base_offset\t# Skip to start of data; set NZ in case count is zero\n\t" 22.9 + "MOV ECX,[EDI+ArrayKlass::length]\t# length to scan\n\t" 22.10 + "ADD EDI,ArrayKlass::base_offset\t# Skip to start of data; set NZ in case count is zero\n\t" 22.11 "REPNE SCASD\t# Scan *EDI++ for a match with EAX while CX-- != 0\n\t" 22.12 "JNE,s miss\t\t# Missed: EDI not-zero\n\t" 22.13 "MOV [$sub+Klass::secondary_super_cache],$super\t# Hit: update cache\n\t" 22.14 @@ -12164,8 +12164,8 @@ 22.15 22.16 ins_cost(1000); 22.17 format %{ "MOV EDI,[$sub+Klass::secondary_supers]\n\t" 22.18 - "MOV ECX,[EDI+arrayKlass::length]\t# length to scan\n\t" 22.19 - "ADD EDI,arrayKlass::base_offset\t# Skip to start of data; set NZ in case count is zero\n\t" 22.20 + "MOV ECX,[EDI+ArrayKlass::length]\t# length to scan\n\t" 22.21 + "ADD EDI,ArrayKlass::base_offset\t# Skip to start of data; set NZ in case count is zero\n\t" 22.22 "REPNE SCASD\t# Scan *EDI++ for a match with EAX while CX-- != 0\n\t" 22.23 "JNE,s miss\t\t# Missed: flags NZ\n\t" 22.24 "MOV [$sub+Klass::secondary_super_cache],$super\t# Hit: update cache, flags Z\n\t"
23.1 --- a/src/os/windows/vm/jvm_windows.h Fri Oct 05 13:37:08 2012 -0700 23.2 +++ b/src/os/windows/vm/jvm_windows.h Tue Oct 09 07:41:27 2012 +0200 23.3 @@ -1,5 +1,5 @@ 23.4 /* 23.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. 23.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 23.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 23.8 * 23.9 * This code is free software; you can redistribute it and/or modify it 23.10 @@ -61,8 +61,6 @@ 23.11 23.12 typedef int socklen_t; 23.13 23.14 -// #include "jni.h" 23.15 - 23.16 #define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"} 23.17 #define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"} 23.18 #define JVM_ONLOAD_SYMBOLS {"_JVM_OnLoad@12", "JVM_OnLoad"} 23.19 @@ -108,10 +106,7 @@ 23.20 * File I/O 23.21 */ 23.22 23.23 -// #include <sys/types.h> 23.24 -// #include <sys/stat.h> 23.25 -// #include <fcntl.h> 23.26 -// #include <errno.h> 23.27 +#include <sys/stat.h> 23.28 23.29 /* O Flags */ 23.30
24.1 --- a/src/share/vm/c1/c1_Runtime1.cpp Fri Oct 05 13:37:08 2012 -0700 24.2 +++ b/src/share/vm/c1/c1_Runtime1.cpp Tue Oct 09 07:41:27 2012 +0200 24.3 @@ -327,7 +327,7 @@ 24.4 // anymore after new_typeArray() and no GC can happen before. 24.5 // (This may have to change if this code changes!) 24.6 assert(klass->is_klass(), "not a class"); 24.7 - BasicType elt_type = typeArrayKlass::cast(klass)->element_type(); 24.8 + BasicType elt_type = TypeArrayKlass::cast(klass)->element_type(); 24.9 oop obj = oopFactory::new_typeArray(elt_type, length, CHECK); 24.10 thread->set_vm_result(obj); 24.11 // This is pretty rare but this runtime patch is stressful to deoptimization 24.12 @@ -346,7 +346,7 @@ 24.13 // anymore after new_objArray() and no GC can happen before. 24.14 // (This may have to change if this code changes!) 24.15 assert(array_klass->is_klass(), "not a class"); 24.16 - Klass* elem_klass = objArrayKlass::cast(array_klass)->element_klass(); 24.17 + Klass* elem_klass = ObjArrayKlass::cast(array_klass)->element_klass(); 24.18 objArrayOop obj = oopFactory::new_objArray(elem_klass, length, CHECK); 24.19 thread->set_vm_result(obj); 24.20 // This is pretty rare but this runtime patch is stressful to deoptimization 24.21 @@ -362,7 +362,7 @@ 24.22 24.23 assert(klass->is_klass(), "not a class"); 24.24 assert(rank >= 1, "rank must be nonzero"); 24.25 - oop obj = arrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK); 24.26 + oop obj = ArrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK); 24.27 thread->set_vm_result(obj); 24.28 JRT_END 24.29 24.30 @@ -1234,8 +1234,8 @@ 24.31 bs->write_ref_array((HeapWord*)dst_addr, length); 24.32 return ac_ok; 24.33 } else { 24.34 - Klass* bound = objArrayKlass::cast(dst->klass())->element_klass(); 24.35 - Klass* stype = objArrayKlass::cast(src->klass())->element_klass(); 24.36 + Klass* bound = ObjArrayKlass::cast(dst->klass())->element_klass(); 24.37 + Klass* stype = ObjArrayKlass::cast(src->klass())->element_klass(); 24.38 if (stype == bound || Klass::cast(stype)->is_subtype_of(bound)) { 24.39 // Elements are guaranteed to be subtypes, so no check necessary 24.40 bs->write_ref_array_pre(dst_addr, length); 24.41 @@ -1263,7 +1263,7 @@ 24.42 if (src->is_typeArray()) { 24.43 Klass* const klass_oop = src->klass(); 24.44 if (klass_oop != dst->klass()) return ac_failed; 24.45 - typeArrayKlass* klass = typeArrayKlass::cast(klass_oop); 24.46 + TypeArrayKlass* klass = TypeArrayKlass::cast(klass_oop); 24.47 const int l2es = klass->log2_element_size(); 24.48 const int ihs = klass->array_header_in_bytes() / wordSize; 24.49 char* src_addr = (char*) ((oopDesc**)src + ihs) + (src_pos << l2es);
25.1 --- a/src/share/vm/ci/ciArrayKlass.cpp Fri Oct 05 13:37:08 2012 -0700 25.2 +++ b/src/share/vm/ci/ciArrayKlass.cpp Tue Oct 09 07:41:27 2012 +0200 25.3 @@ -31,7 +31,7 @@ 25.4 // ciArrayKlass 25.5 // 25.6 // This class represents a Klass* in the HotSpot virtual machine 25.7 -// whose Klass part in an arrayKlass. 25.8 +// whose Klass part in an ArrayKlass. 25.9 25.10 // ------------------------------------------------------------------ 25.11 // ciArrayKlass::ciArrayKlass 25.12 @@ -39,7 +39,7 @@ 25.13 // Loaded array klass. 25.14 ciArrayKlass::ciArrayKlass(KlassHandle h_k) : ciKlass(h_k) { 25.15 assert(get_Klass()->oop_is_array(), "wrong type"); 25.16 - _dimension = get_arrayKlass()->dimension(); 25.17 + _dimension = get_ArrayKlass()->dimension(); 25.18 } 25.19 25.20 // ------------------------------------------------------------------
26.1 --- a/src/share/vm/ci/ciArrayKlass.hpp Fri Oct 05 13:37:08 2012 -0700 26.2 +++ b/src/share/vm/ci/ciArrayKlass.hpp Tue Oct 09 07:41:27 2012 +0200 26.3 @@ -30,7 +30,7 @@ 26.4 // ciArrayKlass 26.5 // 26.6 // This class, and its subclasses represent Klass*s in the 26.7 -// HotSpot virtual machine whose Klass part is an arrayKlass. 26.8 +// HotSpot virtual machine whose Klass part is an ArrayKlass. 26.9 class ciArrayKlass : public ciKlass { 26.10 CI_PACKAGE_ACCESS 26.11 private: 26.12 @@ -40,8 +40,8 @@ 26.13 ciArrayKlass(KlassHandle h_k); 26.14 ciArrayKlass(ciSymbol* name, int dimension, BasicType bt); 26.15 26.16 - arrayKlass* get_arrayKlass() { 26.17 - return (arrayKlass*)get_Klass(); 26.18 + ArrayKlass* get_ArrayKlass() { 26.19 + return (ArrayKlass*)get_Klass(); 26.20 } 26.21 26.22 const char* type_string() { return "ciArrayKlass"; } 26.23 @@ -53,7 +53,7 @@ 26.24 bool is_leaf_type(); // No subtypes of this array type. 26.25 26.26 ciInstance* component_mirror() { 26.27 - // This is a real field in arrayKlass, but we derive it from element_type. 26.28 + // This is a real field in ArrayKlass, but we derive it from element_type. 26.29 return element_type()->java_mirror(); 26.30 } 26.31
27.1 --- a/src/share/vm/ci/ciEnv.cpp Fri Oct 05 13:37:08 2012 -0700 27.2 +++ b/src/share/vm/ci/ciEnv.cpp Tue Oct 09 07:41:27 2012 +0200 27.3 @@ -326,7 +326,7 @@ 27.4 27.5 if (resolved_klass->oop_is_objArray()) { 27.6 // Find the element klass, if this is an array. 27.7 - resolved_klass = objArrayKlass::cast(resolved_klass)->bottom_klass(); 27.8 + resolved_klass = ObjArrayKlass::cast(resolved_klass)->bottom_klass(); 27.9 } 27.10 if (resolved_klass->oop_is_instance()) { 27.11 return Reflection::verify_class_access(accessing_klass->get_Klass(),
28.1 --- a/src/share/vm/ci/ciKlass.hpp Fri Oct 05 13:37:08 2012 -0700 28.2 +++ b/src/share/vm/ci/ciKlass.hpp Tue Oct 09 07:41:27 2012 +0200 28.3 @@ -33,7 +33,7 @@ 28.4 // HotSpot virtual machine. In the vm, each Klass* contains an 28.5 // embedded Klass object. ciKlass is subclassed to explicitly 28.6 // represent the kind of Klass embedded in the Klass*. For 28.7 -// example, a Klass* with an embedded objArrayKlass object is 28.8 +// example, a Klass* with an embedded ObjArrayKlass object is 28.9 // represented in the ciObject hierarchy by the class 28.10 // ciObjArrayKlass. 28.11 class ciKlass : public ciType {
29.1 --- a/src/share/vm/ci/ciObjArrayKlass.cpp Fri Oct 05 13:37:08 2012 -0700 29.2 +++ b/src/share/vm/ci/ciObjArrayKlass.cpp Tue Oct 09 07:41:27 2012 +0200 29.3 @@ -32,7 +32,7 @@ 29.4 // ciObjArrayKlass 29.5 // 29.6 // This class represents a Klass* in the HotSpot virtual machine 29.7 -// whose Klass part is an objArrayKlass. 29.8 +// whose Klass part is an ObjArrayKlass. 29.9 29.10 // ------------------------------------------------------------------ 29.11 // ciObjArrayKlass::ciObjArrayKlass 29.12 @@ -40,7 +40,7 @@ 29.13 // Constructor for loaded object array klasses. 29.14 ciObjArrayKlass::ciObjArrayKlass(KlassHandle h_k) : ciArrayKlass(h_k) { 29.15 assert(get_Klass()->oop_is_objArray(), "wrong type"); 29.16 - Klass* element_Klass = get_objArrayKlass()->bottom_klass(); 29.17 + Klass* element_Klass = get_ObjArrayKlass()->bottom_klass(); 29.18 _base_element_klass = CURRENT_ENV->get_klass(element_Klass); 29.19 assert(_base_element_klass->is_instance_klass() || 29.20 _base_element_klass->is_type_array_klass(), "bad base klass"); 29.21 @@ -83,7 +83,7 @@ 29.22 // Produce the element klass. 29.23 if (is_loaded()) { 29.24 VM_ENTRY_MARK; 29.25 - Klass* element_Klass = get_objArrayKlass()->element_klass(); 29.26 + Klass* element_Klass = get_ObjArrayKlass()->element_klass(); 29.27 _element_klass = CURRENT_THREAD_ENV->get_klass(element_Klass); 29.28 } else { 29.29 VM_ENTRY_MARK;
30.1 --- a/src/share/vm/ci/ciObjArrayKlass.hpp Fri Oct 05 13:37:08 2012 -0700 30.2 +++ b/src/share/vm/ci/ciObjArrayKlass.hpp Tue Oct 09 07:41:27 2012 +0200 30.3 @@ -30,7 +30,7 @@ 30.4 // ciObjArrayKlass 30.5 // 30.6 // This class represents a Klass* in the HotSpot virtual machine 30.7 -// whose Klass part is an objArrayKlass. 30.8 +// whose Klass part is an ObjArrayKlass. 30.9 class ciObjArrayKlass : public ciArrayKlass { 30.10 CI_PACKAGE_ACCESS 30.11 friend class ciEnv; 30.12 @@ -45,8 +45,8 @@ 30.13 ciKlass* base_element_klass, 30.14 int dimension); 30.15 30.16 - objArrayKlass* get_objArrayKlass() { 30.17 - return (objArrayKlass*)get_Klass(); 30.18 + ObjArrayKlass* get_ObjArrayKlass() { 30.19 + return (ObjArrayKlass*)get_Klass(); 30.20 } 30.21 30.22 static ciObjArrayKlass* make_impl(ciKlass* element_klass);
31.1 --- a/src/share/vm/ci/ciObjectFactory.cpp Fri Oct 05 13:37:08 2012 -0700 31.2 +++ b/src/share/vm/ci/ciObjectFactory.cpp Tue Oct 09 07:41:27 2012 +0200 31.3 @@ -174,7 +174,7 @@ 31.4 } 31.5 31.6 ciEnv::_unloaded_cisymbol = ciObjectFactory::get_symbol(vmSymbols::dummy_symbol()); 31.7 - // Create dummy InstanceKlass and objArrayKlass object and assign them idents 31.8 + // Create dummy InstanceKlass and ObjArrayKlass object and assign them idents 31.9 ciEnv::_unloaded_ciinstance_klass = new (_arena) ciInstanceKlass(ciEnv::_unloaded_cisymbol, NULL, NULL); 31.10 init_ident_of(ciEnv::_unloaded_ciinstance_klass); 31.11 ciEnv::_unloaded_ciobjarrayklass = new (_arena) ciObjArrayKlass(ciEnv::_unloaded_cisymbol, ciEnv::_unloaded_ciinstance_klass, 1); 31.12 @@ -454,7 +454,7 @@ 31.13 // the cache. 31.14 ciKlass* new_klass = NULL; 31.15 31.16 - // Two cases: this is an unloaded objArrayKlass or an 31.17 + // Two cases: this is an unloaded ObjArrayKlass or an 31.18 // unloaded InstanceKlass. Deal with both. 31.19 if (name->byte_at(0) == '[') { 31.20 // Decompose the name.' 31.21 @@ -480,7 +480,7 @@ 31.22 // The type array itself takes care of one of the dimensions. 31.23 dimension--; 31.24 31.25 - // The element klass is a typeArrayKlass. 31.26 + // The element klass is a TypeArrayKlass. 31.27 element_klass = ciTypeArrayKlass::make(element_type); 31.28 } 31.29 new_klass = new (arena()) ciObjArrayKlass(name, element_klass, dimension);
32.1 --- a/src/share/vm/ci/ciTypeArrayKlass.cpp Fri Oct 05 13:37:08 2012 -0700 32.2 +++ b/src/share/vm/ci/ciTypeArrayKlass.cpp Tue Oct 09 07:41:27 2012 +0200 32.3 @@ -35,7 +35,7 @@ 32.4 // ciTypeArrayKlass::ciTypeArrayKlass 32.5 ciTypeArrayKlass::ciTypeArrayKlass(KlassHandle h_k) : ciArrayKlass(h_k) { 32.6 assert(get_Klass()->oop_is_typeArray(), "wrong type"); 32.7 - assert(element_type() == get_typeArrayKlass()->element_type(), ""); 32.8 + assert(element_type() == get_TypeArrayKlass()->element_type(), ""); 32.9 } 32.10 32.11 // ------------------------------------------------------------------
33.1 --- a/src/share/vm/ci/ciTypeArrayKlass.hpp Fri Oct 05 13:37:08 2012 -0700 33.2 +++ b/src/share/vm/ci/ciTypeArrayKlass.hpp Tue Oct 09 07:41:27 2012 +0200 33.3 @@ -37,8 +37,8 @@ 33.4 protected: 33.5 ciTypeArrayKlass(KlassHandle h_k); 33.6 33.7 - typeArrayKlass* get_typeArrayKlass() { 33.8 - return (typeArrayKlass*)get_Klass(); 33.9 + TypeArrayKlass* get_TypeArrayKlass() { 33.10 + return (TypeArrayKlass*)get_Klass(); 33.11 } 33.12 33.13 const char* type_string() { return "ciTypeArrayKlass"; }
34.1 --- a/src/share/vm/classfile/classFileParser.cpp Fri Oct 05 13:37:08 2012 -0700 34.2 +++ b/src/share/vm/classfile/classFileParser.cpp Tue Oct 09 07:41:27 2012 +0200 34.3 @@ -782,7 +782,7 @@ 34.4 34.5 Array<Klass*>* ClassFileParser::parse_interfaces(constantPoolHandle cp, 34.6 int length, 34.7 - ClassLoaderData* loader_data, 34.8 + ClassLoaderData* loader_data, 34.9 Handle protection_domain, 34.10 Symbol* class_name, 34.11 TRAPS) { 34.12 @@ -1072,10 +1072,11 @@ 34.13 34.14 Array<u2>* ClassFileParser::parse_fields(ClassLoaderData* loader_data, 34.15 Symbol* class_name, 34.16 - constantPoolHandle cp, bool is_interface, 34.17 - FieldAllocationCount *fac, 34.18 + constantPoolHandle cp, 34.19 + bool is_interface, 34.20 + FieldAllocationCount *fac, 34.21 Array<AnnotationArray*>** fields_annotations, 34.22 - u2* java_fields_count_ptr, TRAPS) { 34.23 + u2* java_fields_count_ptr, TRAPS) { 34.24 ClassFileStream* cfs = stream(); 34.25 cfs->guarantee_more(2, CHECK_NULL); // length 34.26 u2 length = cfs->get_u2_fast(); 34.27 @@ -2169,14 +2170,12 @@ 34.28 } 34.29 34.30 // All sizing information for a Method* is finally available, now create it 34.31 - Method* m = Method::allocate(loader_data, 34.32 - code_length, 34.33 - access_flags, 34.34 - linenumber_table_length, 34.35 - total_lvt_length, 34.36 - exception_table_length, 34.37 - checked_exceptions_length, 34.38 - CHECK_(nullHandle)); 34.39 + Method* m = Method::allocate(loader_data, code_length, access_flags, 34.40 + linenumber_table_length, 34.41 + total_lvt_length, 34.42 + exception_table_length, 34.43 + checked_exceptions_length, 34.44 + CHECK_(nullHandle)); 34.45 34.46 ClassLoadingService::add_class_method_size(m->size()*HeapWordSize); 34.47 34.48 @@ -2351,14 +2350,14 @@ 34.49 // are added to klass's access_flags. 34.50 34.51 Array<Method*>* ClassFileParser::parse_methods(ClassLoaderData* loader_data, 34.52 - constantPoolHandle cp, 34.53 - bool is_interface, 34.54 - AccessFlags* promoted_flags, 34.55 - bool* has_final_method, 34.56 - Array<AnnotationArray*>** methods_annotations, 34.57 - Array<AnnotationArray*>** methods_parameter_annotations, 34.58 - Array<AnnotationArray*>** methods_default_annotations, 34.59 - TRAPS) { 34.60 + constantPoolHandle cp, 34.61 + bool is_interface, 34.62 + AccessFlags* promoted_flags, 34.63 + bool* has_final_method, 34.64 + Array<AnnotationArray*>** methods_annotations, 34.65 + Array<AnnotationArray*>** methods_parameter_annotations, 34.66 + Array<AnnotationArray*>** methods_default_annotations, 34.67 + TRAPS) { 34.68 ClassFileStream* cfs = stream(); 34.69 AnnotationArray* method_annotations = NULL; 34.70 AnnotationArray* method_parameter_annotations = NULL; 34.71 @@ -2450,10 +2449,9 @@ 34.72 } 34.73 // Sort method array by ascending method name (for faster lookups & vtable construction) 34.74 // Note that the ordering is not alphabetical, see Symbol::fast_compare 34.75 - Method::sort_methods(methods, 34.76 - methods_annotations, 34.77 - methods_parameter_annotations, 34.78 - methods_default_annotations); 34.79 + Method::sort_methods(methods, methods_annotations, 34.80 + methods_parameter_annotations, 34.81 + methods_default_annotations); 34.82 34.83 // If JVMTI original method ordering or sharing is enabled construct int 34.84 // array remembering the original ordering 34.85 @@ -2835,10 +2833,10 @@ 34.86 } 34.87 AnnotationArray* annotations = assemble_annotations(loader_data, 34.88 runtime_visible_annotations, 34.89 - runtime_visible_annotations_length, 34.90 - runtime_invisible_annotations, 34.91 - runtime_invisible_annotations_length, 34.92 - CHECK); 34.93 + runtime_visible_annotations_length, 34.94 + runtime_invisible_annotations, 34.95 + runtime_invisible_annotations_length, 34.96 + CHECK); 34.97 set_class_annotations(annotations); 34.98 34.99 if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) { 34.100 @@ -2884,9 +2882,9 @@ 34.101 34.102 AnnotationArray* ClassFileParser::assemble_annotations(ClassLoaderData* loader_data, 34.103 u1* runtime_visible_annotations, 34.104 - int runtime_visible_annotations_length, 34.105 - u1* runtime_invisible_annotations, 34.106 - int runtime_invisible_annotations_length, TRAPS) { 34.107 + int runtime_visible_annotations_length, 34.108 + u1* runtime_invisible_annotations, 34.109 + int runtime_invisible_annotations_length, TRAPS) { 34.110 AnnotationArray* annotations = NULL; 34.111 if (runtime_visible_annotations != NULL || 34.112 runtime_invisible_annotations != NULL) { 34.113 @@ -3161,13 +3159,13 @@ 34.114 Array<AnnotationArray*>* methods_parameter_annotations = NULL; 34.115 Array<AnnotationArray*>* methods_default_annotations = NULL; 34.116 Array<Method*>* methods = parse_methods(loader_data, 34.117 - cp, access_flags.is_interface(), 34.118 - &promoted_flags, 34.119 - &has_final_method, 34.120 - &methods_annotations, 34.121 - &methods_parameter_annotations, 34.122 - &methods_default_annotations, 34.123 - CHECK_(nullHandle)); 34.124 + cp, access_flags.is_interface(), 34.125 + &promoted_flags, 34.126 + &has_final_method, 34.127 + &methods_annotations, 34.128 + &methods_parameter_annotations, 34.129 + &methods_default_annotations, 34.130 + CHECK_(nullHandle)); 34.131 34.132 // Additional attributes 34.133 ClassAnnotationCollector parsed_annotations; 34.134 @@ -3186,12 +3184,11 @@ 34.135 "Interfaces must have java.lang.Object as superclass in class file %s", 34.136 CHECK_(nullHandle)); 34.137 } 34.138 - Klass* k = SystemDictionary::resolve_super_or_fail(class_name, 34.139 - sk, 34.140 - class_loader, 34.141 - protection_domain, 34.142 - true, 34.143 - CHECK_(nullHandle)); 34.144 + Klass* k = SystemDictionary::resolve_super_or_fail(class_name, sk, 34.145 + class_loader, 34.146 + protection_domain, 34.147 + true, 34.148 + CHECK_(nullHandle)); 34.149 34.150 KlassHandle kh (THREAD, k); 34.151 super_klass = instanceKlassHandle(THREAD, kh()); 34.152 @@ -3222,10 +3219,10 @@ 34.153 // sort methods 34.154 Array<int>* method_ordering = sort_methods(loader_data, 34.155 methods, 34.156 - methods_annotations, 34.157 - methods_parameter_annotations, 34.158 - methods_default_annotations, 34.159 - CHECK_(nullHandle)); 34.160 + methods_annotations, 34.161 + methods_parameter_annotations, 34.162 + methods_default_annotations, 34.163 + CHECK_(nullHandle)); 34.164 34.165 // promote flags from parse_methods() to the klass' flags 34.166 access_flags.add_promoted_flags(promoted_flags.as_int()); 34.167 @@ -3591,16 +3588,16 @@ 34.168 InstanceKlass::nonstatic_oop_map_size(total_oop_map_count); 34.169 34.170 Klass* ik = InstanceKlass::allocate_instance_klass(loader_data, 34.171 - vtable_size, 34.172 - itable_size, 34.173 - static_field_size, 34.174 - total_oop_map_size2, 34.175 - rt, 34.176 - access_flags, 34.177 - name, 34.178 - super_klass(), 34.179 - host_klass, 34.180 - CHECK_(nullHandle)); 34.181 + vtable_size, 34.182 + itable_size, 34.183 + static_field_size, 34.184 + total_oop_map_size2, 34.185 + rt, 34.186 + access_flags, 34.187 + name, 34.188 + super_klass(), 34.189 + host_klass, 34.190 + CHECK_(nullHandle)); 34.191 34.192 // Add all classes to our internal class loader list here, 34.193 // including classes in the bootstrap (NULL) class loader.
35.1 --- a/src/share/vm/classfile/classFileParser.hpp Fri Oct 05 13:37:08 2012 -0700 35.2 +++ b/src/share/vm/classfile/classFileParser.hpp Tue Oct 09 07:41:27 2012 +0200 35.3 @@ -148,7 +148,7 @@ 35.4 // Interface parsing 35.5 Array<Klass*>* parse_interfaces(constantPoolHandle cp, 35.6 int length, 35.7 - ClassLoaderData* loader_data, 35.8 + ClassLoaderData* loader_data, 35.9 Handle protection_domain, 35.10 Symbol* class_name, 35.11 TRAPS); 35.12 @@ -166,10 +166,10 @@ 35.13 TRAPS); 35.14 Array<u2>* parse_fields(ClassLoaderData* loader_data, 35.15 Symbol* class_name, 35.16 - constantPoolHandle cp, bool is_interface, 35.17 - FieldAllocationCount *fac, 35.18 + constantPoolHandle cp, bool is_interface, 35.19 + FieldAllocationCount *fac, 35.20 Array<AnnotationArray*>** fields_annotations, 35.21 - u2* java_fields_count_ptr, TRAPS); 35.22 + u2* java_fields_count_ptr, TRAPS); 35.23 35.24 // Method parsing 35.25 methodHandle parse_method(ClassLoaderData* loader_data, 35.26 @@ -181,13 +181,13 @@ 35.27 AnnotationArray** method_default_annotations, 35.28 TRAPS); 35.29 Array<Method*>* parse_methods(ClassLoaderData* loader_data, 35.30 - constantPoolHandle cp, 35.31 - bool is_interface, 35.32 + constantPoolHandle cp, 35.33 + bool is_interface, 35.34 AccessFlags* promoted_flags, 35.35 bool* has_final_method, 35.36 - Array<AnnotationArray*>** methods_annotations, 35.37 - Array<AnnotationArray*>** methods_parameter_annotations, 35.38 - Array<AnnotationArray*>** methods_default_annotations, 35.39 + Array<AnnotationArray*>** methods_annotations, 35.40 + Array<AnnotationArray*>** methods_parameter_annotations, 35.41 + Array<AnnotationArray*>** methods_default_annotations, 35.42 TRAPS); 35.43 Array<int>* sort_methods(ClassLoaderData* loader_data, 35.44 Array<Method*>* methods, 35.45 @@ -232,9 +232,9 @@ 35.46 // Annotations handling 35.47 AnnotationArray* assemble_annotations(ClassLoaderData* loader_data, 35.48 u1* runtime_visible_annotations, 35.49 - int runtime_visible_annotations_length, 35.50 - u1* runtime_invisible_annotations, 35.51 - int runtime_invisible_annotations_length, TRAPS); 35.52 + int runtime_visible_annotations_length, 35.53 + u1* runtime_invisible_annotations, 35.54 + int runtime_invisible_annotations_length, TRAPS); 35.55 int skip_annotation(u1* buffer, int limit, int index); 35.56 int skip_annotation_value(u1* buffer, int limit, int index); 35.57 void parse_annotations(u1* buffer, int limit, constantPoolHandle cp, 35.58 @@ -252,8 +252,8 @@ 35.59 unsigned int* nonstatic_oop_counts); 35.60 void set_precomputed_flags(instanceKlassHandle k); 35.61 Array<Klass*>* compute_transitive_interfaces(ClassLoaderData* loader_data, 35.62 - instanceKlassHandle super, 35.63 - Array<Klass*>* local_ifs, TRAPS); 35.64 + instanceKlassHandle super, 35.65 + Array<Klass*>* local_ifs, TRAPS); 35.66 35.67 // Format checker methods 35.68 void classfile_parse_error(const char* msg, TRAPS);
36.1 --- a/src/share/vm/classfile/javaClasses.cpp Fri Oct 05 13:37:08 2012 -0700 36.2 +++ b/src/share/vm/classfile/javaClasses.cpp Tue Oct 09 07:41:27 2012 +0200 36.3 @@ -540,18 +540,18 @@ 36.4 if (k->oop_is_array()) { 36.5 Handle comp_mirror; 36.6 if (k->oop_is_typeArray()) { 36.7 - BasicType type = typeArrayKlass::cast(k())->element_type(); 36.8 + BasicType type = TypeArrayKlass::cast(k())->element_type(); 36.9 comp_mirror = Universe::java_mirror(type); 36.10 } else { 36.11 assert(k->oop_is_objArray(), "Must be"); 36.12 - Klass* element_klass = objArrayKlass::cast(k())->element_klass(); 36.13 + Klass* element_klass = ObjArrayKlass::cast(k())->element_klass(); 36.14 assert(element_klass != NULL, "Must have an element klass"); 36.15 comp_mirror = Klass::cast(element_klass)->java_mirror(); 36.16 } 36.17 assert(comp_mirror.not_null(), "must have a mirror"); 36.18 36.19 // Two-way link between the array klass and its component mirror: 36.20 - arrayKlass::cast(k())->set_component_mirror(comp_mirror()); 36.21 + ArrayKlass::cast(k())->set_component_mirror(comp_mirror()); 36.22 set_array_klass(comp_mirror(), k()); 36.23 } else { 36.24 assert(k->oop_is_instance(), "Must be"); 36.25 @@ -704,7 +704,7 @@ 36.26 #ifdef ASSERT 36.27 if (is_primitive) { 36.28 Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset)); 36.29 - assert(k == NULL || is_java_primitive(arrayKlass::cast(k)->element_type()), 36.30 + assert(k == NULL || is_java_primitive(ArrayKlass::cast(k)->element_type()), 36.31 "Should be either the T_VOID primitive or a java primitive"); 36.32 } 36.33 #endif 36.34 @@ -719,7 +719,7 @@ 36.35 BasicType type = T_VOID; 36.36 if (ak != NULL) { 36.37 // Note: create_basic_type_mirror above initializes ak to a non-null value. 36.38 - type = arrayKlass::cast(ak)->element_type(); 36.39 + type = ArrayKlass::cast(ak)->element_type(); 36.40 } else { 36.41 assert(java_class == Universe::void_mirror(), "only valid non-array primitive"); 36.42 } 36.43 @@ -846,7 +846,7 @@ 36.44 36.45 typeArrayOop java_lang_Thread::name(oop java_thread) { 36.46 oop name = java_thread->obj_field(_name_offset); 36.47 - assert(name == NULL || (name->is_typeArray() && typeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking"); 36.48 + assert(name == NULL || (name->is_typeArray() && TypeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking"); 36.49 return typeArrayOop(name); 36.50 } 36.51
37.1 --- a/src/share/vm/classfile/systemDictionary.cpp Fri Oct 05 13:37:08 2012 -0700 37.2 +++ b/src/share/vm/classfile/systemDictionary.cpp Tue Oct 09 07:41:27 2012 +0200 37.3 @@ -244,7 +244,7 @@ 37.4 } 37.5 } else { 37.6 k = Universe::typeArrayKlassObj(t); 37.7 - k = typeArrayKlass::cast(k)->array_klass(fd.dimension(), CHECK_NULL); 37.8 + k = TypeArrayKlass::cast(k)->array_klass(fd.dimension(), CHECK_NULL); 37.9 } 37.10 return k; 37.11 } 37.12 @@ -920,9 +920,9 @@ 37.13 // Look for a loaded instance or array klass by name. Do not do any loading. 37.14 // return NULL in case of error. 37.15 Klass* SystemDictionary::find_instance_or_array_klass(Symbol* class_name, 37.16 - Handle class_loader, 37.17 - Handle protection_domain, 37.18 - TRAPS) { 37.19 + Handle class_loader, 37.20 + Handle protection_domain, 37.21 + TRAPS) { 37.22 Klass* k = NULL; 37.23 assert(class_name != NULL, "class name must be non NULL"); 37.24 37.25 @@ -990,12 +990,12 @@ 37.26 // updates no supplemental data structures. 37.27 // TODO consolidate the two methods with a helper routine? 37.28 Klass* SystemDictionary::parse_stream(Symbol* class_name, 37.29 - Handle class_loader, 37.30 - Handle protection_domain, 37.31 - ClassFileStream* st, 37.32 - KlassHandle host_klass, 37.33 - GrowableArray<Handle>* cp_patches, 37.34 - TRAPS) { 37.35 + Handle class_loader, 37.36 + Handle protection_domain, 37.37 + ClassFileStream* st, 37.38 + KlassHandle host_klass, 37.39 + GrowableArray<Handle>* cp_patches, 37.40 + TRAPS) { 37.41 TempNewSymbol parsed_name = NULL; 37.42 37.43 // Parse the stream. Note that we do this even though this klass might 37.44 @@ -1076,11 +1076,11 @@ 37.45 // the class until we have parsed the stream. 37.46 37.47 Klass* SystemDictionary::resolve_from_stream(Symbol* class_name, 37.48 - Handle class_loader, 37.49 - Handle protection_domain, 37.50 - ClassFileStream* st, 37.51 - bool verify, 37.52 - TRAPS) { 37.53 + Handle class_loader, 37.54 + Handle protection_domain, 37.55 + ClassFileStream* st, 37.56 + bool verify, 37.57 + TRAPS) { 37.58 37.59 // Classloaders that support parallelism, e.g. bootstrap classloader, 37.60 // or all classloaders with UnsyncloadClass do not acquire lock here 37.61 @@ -2187,7 +2187,7 @@ 37.62 // Force the protection domain to be null. (This removes protection checks.) 37.63 Handle no_protection_domain; 37.64 Klass* klass = find_instance_or_array_klass(class_name, class_loader, 37.65 - no_protection_domain, CHECK_NULL); 37.66 + no_protection_domain, CHECK_NULL); 37.67 if (klass != NULL) 37.68 return klass; 37.69 37.70 @@ -2525,7 +2525,7 @@ 37.71 mirror = NULL; // safety 37.72 // Emulate ConstantPool::verify_constant_pool_resolve. 37.73 if (Klass::cast(sel_klass)->oop_is_objArray()) 37.74 - sel_klass = objArrayKlass::cast(sel_klass)->bottom_klass(); 37.75 + sel_klass = ObjArrayKlass::cast(sel_klass)->bottom_klass(); 37.76 if (Klass::cast(sel_klass)->oop_is_instance()) { 37.77 KlassHandle sel_kh(THREAD, sel_klass); 37.78 LinkResolver::check_klass_accessability(accessing_klass, sel_kh, CHECK_(empty));
38.1 --- a/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp Fri Oct 05 13:37:08 2012 -0700 38.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp Tue Oct 09 07:41:27 2012 +0200 38.3 @@ -204,7 +204,7 @@ 38.4 int random_seed = 17; 38.5 do { 38.6 while (ParCompactionManager::steal_objarray(which, &random_seed, task)) { 38.7 - objArrayKlass* const k = (objArrayKlass*)task.obj()->klass(); 38.8 + ObjArrayKlass* const k = (ObjArrayKlass*)task.obj()->klass(); 38.9 k->oop_follow_contents(cm, task.obj(), task.index()); 38.10 cm->follow_marking_stacks(); 38.11 }
39.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp Fri Oct 05 13:37:08 2012 -0700 39.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp Tue Oct 09 07:41:27 2012 +0200 39.3 @@ -188,10 +188,10 @@ 39.4 // Process ObjArrays one at a time to avoid marking stack bloat. 39.5 ObjArrayTask task; 39.6 if (_objarray_stack.pop_overflow(task)) { 39.7 - objArrayKlass* const k = (objArrayKlass*)task.obj()->klass(); 39.8 + ObjArrayKlass* const k = (ObjArrayKlass*)task.obj()->klass(); 39.9 k->oop_follow_contents(this, task.obj(), task.index()); 39.10 } else if (_objarray_stack.pop_local(task)) { 39.11 - objArrayKlass* const k = (objArrayKlass*)task.obj()->klass(); 39.12 + ObjArrayKlass* const k = (ObjArrayKlass*)task.obj()->klass(); 39.13 k->oop_follow_contents(this, task.obj(), task.index()); 39.14 } 39.15 } while (!marking_stacks_empty());
40.1 --- a/src/share/vm/gc_implementation/shared/markSweep.cpp Fri Oct 05 13:37:08 2012 -0700 40.2 +++ b/src/share/vm/gc_implementation/shared/markSweep.cpp Tue Oct 09 07:41:27 2012 +0200 40.3 @@ -115,7 +115,7 @@ 40.4 // Process ObjArrays one at a time to avoid marking stack bloat. 40.5 if (!_objarray_stack.is_empty()) { 40.6 ObjArrayTask task = _objarray_stack.pop(); 40.7 - objArrayKlass* const k = (objArrayKlass*)task.obj()->klass(); 40.8 + ObjArrayKlass* const k = (ObjArrayKlass*)task.obj()->klass(); 40.9 k->oop_follow_contents(task.obj(), task.index()); 40.10 } 40.11 } while (!_marking_stack.is_empty() || !_objarray_stack.is_empty());
41.1 --- a/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Oct 05 13:37:08 2012 -0700 41.2 +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue Oct 09 07:41:27 2012 +0200 41.3 @@ -1626,7 +1626,7 @@ 41.4 if (rhsObject != NULL) { 41.5 /* Check assignability of rhsObject into arrObj */ 41.6 Klass* rhsKlassOop = rhsObject->klass(); // EBX (subclass) 41.7 - Klass* elemKlassOop = objArrayKlass::cast(arrObj->klass())->element_klass(); // superklass EAX 41.8 + Klass* elemKlassOop = ObjArrayKlass::cast(arrObj->klass())->element_klass(); // superklass EAX 41.9 // 41.10 // Check for compatibilty. This check must not GC!! 41.11 // Seems way more expensive now that we must dispatch
42.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp Fri Oct 05 13:37:08 2012 -0700 42.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Tue Oct 09 07:41:27 2012 +0200 42.3 @@ -211,7 +211,7 @@ 42.4 int n = Interpreter::local_offset_in_bytes(index)/jintSize; 42.5 dims[index] = first_size_address[n]; 42.6 } 42.7 - oop obj = arrayKlass::cast(klass)->multi_allocate(nof_dims, dims, CHECK); 42.8 + oop obj = ArrayKlass::cast(klass)->multi_allocate(nof_dims, dims, CHECK); 42.9 thread->set_vm_result(obj); 42.10 IRT_END 42.11
43.1 --- a/src/share/vm/memory/oopFactory.cpp Fri Oct 05 13:37:08 2012 -0700 43.2 +++ b/src/share/vm/memory/oopFactory.cpp Tue Oct 09 07:41:27 2012 +0200 43.3 @@ -47,12 +47,12 @@ 43.4 } 43.5 43.6 typeArrayOop oopFactory::new_tenured_charArray(int length, TRAPS) { 43.7 - return typeArrayKlass::cast(Universe::charArrayKlassObj())->allocate(length, THREAD); 43.8 + return TypeArrayKlass::cast(Universe::charArrayKlassObj())->allocate(length, THREAD); 43.9 } 43.10 43.11 typeArrayOop oopFactory::new_typeArray(BasicType type, int length, TRAPS) { 43.12 Klass* type_asKlassOop = Universe::typeArrayKlassObj(type); 43.13 - typeArrayKlass* type_asArrayKlass = typeArrayKlass::cast(type_asKlassOop); 43.14 + TypeArrayKlass* type_asArrayKlass = TypeArrayKlass::cast(type_asKlassOop); 43.15 typeArrayOop result = type_asArrayKlass->allocate(length, THREAD); 43.16 return result; 43.17 } 43.18 @@ -66,14 +66,14 @@ 43.19 typeArrayOop oopFactory::new_metaDataArray(int length, TRAPS) { 43.20 BasicType type = LP64_ONLY(T_LONG) NOT_LP64(T_INT); 43.21 Klass* type_asKlassOop = Universe::typeArrayKlassObj(type); 43.22 - typeArrayKlass* type_asArrayKlass = typeArrayKlass::cast(type_asKlassOop); 43.23 + TypeArrayKlass* type_asArrayKlass = TypeArrayKlass::cast(type_asKlassOop); 43.24 typeArrayOop result = type_asArrayKlass->allocate_common(length, true, THREAD); 43.25 return result; 43.26 } 43.27 43.28 typeArrayOop oopFactory::new_typeArray_nozero(BasicType type, int length, TRAPS) { 43.29 Klass* type_asKlassOop = Universe::typeArrayKlassObj(type); 43.30 - typeArrayKlass* type_asArrayKlass = typeArrayKlass::cast(type_asKlassOop); 43.31 + TypeArrayKlass* type_asArrayKlass = TypeArrayKlass::cast(type_asKlassOop); 43.32 typeArrayOop result = type_asArrayKlass->allocate_common(length, false, THREAD); 43.33 return result; 43.34 } 43.35 @@ -82,7 +82,7 @@ 43.36 objArrayOop oopFactory::new_objArray(Klass* klass, int length, TRAPS) { 43.37 assert(klass->is_klass(), "must be instance class"); 43.38 if (klass->oop_is_array()) { 43.39 - return ((arrayKlass*)klass)->allocate_arrayArray(1, length, THREAD); 43.40 + return ((ArrayKlass*)klass)->allocate_arrayArray(1, length, THREAD); 43.41 } else { 43.42 assert (klass->oop_is_instance(), "new object array with klass not an InstanceKlass"); 43.43 return ((InstanceKlass*)klass)->allocate_objArray(1, length, THREAD);
44.1 --- a/src/share/vm/memory/oopFactory.hpp Fri Oct 05 13:37:08 2012 -0700 44.2 +++ b/src/share/vm/memory/oopFactory.hpp Tue Oct 09 07:41:27 2012 +0200 44.3 @@ -40,19 +40,19 @@ 44.4 class oopFactory: AllStatic { 44.5 public: 44.6 // Basic type leaf array allocation 44.7 - static typeArrayOop new_boolArray (int length, TRAPS) { return typeArrayKlass::cast(Universe::boolArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.8 - static typeArrayOop new_charArray (int length, TRAPS) { return typeArrayKlass::cast(Universe::charArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.9 - static typeArrayOop new_singleArray(int length, TRAPS) { return typeArrayKlass::cast(Universe::singleArrayKlassObj())->allocate(length, CHECK_NULL); } 44.10 - static typeArrayOop new_doubleArray(int length, TRAPS) { return typeArrayKlass::cast(Universe::doubleArrayKlassObj())->allocate(length, CHECK_NULL); } 44.11 - static typeArrayOop new_byteArray (int length, TRAPS) { return typeArrayKlass::cast(Universe::byteArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.12 - static typeArrayOop new_shortArray (int length, TRAPS) { return typeArrayKlass::cast(Universe::shortArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.13 - static typeArrayOop new_intArray (int length, TRAPS) { return typeArrayKlass::cast(Universe::intArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.14 - static typeArrayOop new_longArray (int length, TRAPS) { return typeArrayKlass::cast(Universe::longArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.15 + static typeArrayOop new_boolArray (int length, TRAPS) { return TypeArrayKlass::cast(Universe::boolArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.16 + static typeArrayOop new_charArray (int length, TRAPS) { return TypeArrayKlass::cast(Universe::charArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.17 + static typeArrayOop new_singleArray(int length, TRAPS) { return TypeArrayKlass::cast(Universe::singleArrayKlassObj())->allocate(length, CHECK_NULL); } 44.18 + static typeArrayOop new_doubleArray(int length, TRAPS) { return TypeArrayKlass::cast(Universe::doubleArrayKlassObj())->allocate(length, CHECK_NULL); } 44.19 + static typeArrayOop new_byteArray (int length, TRAPS) { return TypeArrayKlass::cast(Universe::byteArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.20 + static typeArrayOop new_shortArray (int length, TRAPS) { return TypeArrayKlass::cast(Universe::shortArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.21 + static typeArrayOop new_intArray (int length, TRAPS) { return TypeArrayKlass::cast(Universe::intArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.22 + static typeArrayOop new_longArray (int length, TRAPS) { return TypeArrayKlass::cast(Universe::longArrayKlassObj ())->allocate(length, CHECK_NULL); } 44.23 44.24 // create java.lang.Object[] 44.25 static objArrayOop new_objectArray(int length, TRAPS) { 44.26 assert(Universe::objectArrayKlassObj() != NULL, "Too early?"); 44.27 - return objArrayKlass:: 44.28 + return ObjArrayKlass:: 44.29 cast(Universe::objectArrayKlassObj())->allocate(length, CHECK_NULL); 44.30 } 44.31
45.1 --- a/src/share/vm/memory/specialized_oop_closures.hpp Fri Oct 05 13:37:08 2012 -0700 45.2 +++ b/src/share/vm/memory/specialized_oop_closures.hpp Tue Oct 09 07:41:27 2012 +0200 45.3 @@ -200,7 +200,7 @@ 45.4 enum Kind { 45.5 ik, // InstanceKlass 45.6 irk, // InstanceRefKlass 45.7 - oa, // objArrayKlass 45.8 + oa, // ObjArrayKlass 45.9 NUM_Kinds 45.10 }; 45.11
46.1 --- a/src/share/vm/memory/universe.cpp Fri Oct 05 13:37:08 2012 -0700 46.2 +++ b/src/share/vm/memory/universe.cpp Tue Oct 09 07:41:27 2012 +0200 46.3 @@ -265,14 +265,14 @@ 46.4 compute_base_vtable_size(); 46.5 46.6 if (!UseSharedSpaces) { 46.7 - _boolArrayKlassObj = typeArrayKlass::create_klass(T_BOOLEAN, sizeof(jboolean), CHECK); 46.8 - _charArrayKlassObj = typeArrayKlass::create_klass(T_CHAR, sizeof(jchar), CHECK); 46.9 - _singleArrayKlassObj = typeArrayKlass::create_klass(T_FLOAT, sizeof(jfloat), CHECK); 46.10 - _doubleArrayKlassObj = typeArrayKlass::create_klass(T_DOUBLE, sizeof(jdouble), CHECK); 46.11 - _byteArrayKlassObj = typeArrayKlass::create_klass(T_BYTE, sizeof(jbyte), CHECK); 46.12 - _shortArrayKlassObj = typeArrayKlass::create_klass(T_SHORT, sizeof(jshort), CHECK); 46.13 - _intArrayKlassObj = typeArrayKlass::create_klass(T_INT, sizeof(jint), CHECK); 46.14 - _longArrayKlassObj = typeArrayKlass::create_klass(T_LONG, sizeof(jlong), CHECK); 46.15 + _boolArrayKlassObj = TypeArrayKlass::create_klass(T_BOOLEAN, sizeof(jboolean), CHECK); 46.16 + _charArrayKlassObj = TypeArrayKlass::create_klass(T_CHAR, sizeof(jchar), CHECK); 46.17 + _singleArrayKlassObj = TypeArrayKlass::create_klass(T_FLOAT, sizeof(jfloat), CHECK); 46.18 + _doubleArrayKlassObj = TypeArrayKlass::create_klass(T_DOUBLE, sizeof(jdouble), CHECK); 46.19 + _byteArrayKlassObj = TypeArrayKlass::create_klass(T_BYTE, sizeof(jbyte), CHECK); 46.20 + _shortArrayKlassObj = TypeArrayKlass::create_klass(T_SHORT, sizeof(jshort), CHECK); 46.21 + _intArrayKlassObj = TypeArrayKlass::create_klass(T_INT, sizeof(jint), CHECK); 46.22 + _longArrayKlassObj = TypeArrayKlass::create_klass(T_LONG, sizeof(jlong), CHECK); 46.23 46.24 _typeArrayKlassObjs[T_BOOLEAN] = _boolArrayKlassObj; 46.25 _typeArrayKlassObjs[T_CHAR] = _charArrayKlassObj; 46.26 @@ -440,8 +440,8 @@ 46.27 { InstanceClassLoaderKlass o; add_vtable(list, &n, &o, count); } 46.28 { InstanceMirrorKlass o; add_vtable(list, &n, &o, count); } 46.29 { InstanceRefKlass o; add_vtable(list, &n, &o, count); } 46.30 - { typeArrayKlass o; add_vtable(list, &n, &o, count); } 46.31 - { objArrayKlass o; add_vtable(list, &n, &o, count); } 46.32 + { TypeArrayKlass o; add_vtable(list, &n, &o, count); } 46.33 + { ObjArrayKlass o; add_vtable(list, &n, &o, count); } 46.34 { Method o; add_vtable(list, &n, &o, count); } 46.35 { ConstantPool o; add_vtable(list, &n, &o, count); } 46.36 }
47.1 --- a/src/share/vm/oops/arrayKlass.cpp Fri Oct 05 13:37:08 2012 -0700 47.2 +++ b/src/share/vm/oops/arrayKlass.cpp Tue Oct 09 07:41:27 2012 +0200 47.3 @@ -36,7 +36,7 @@ 47.4 #include "oops/objArrayOop.hpp" 47.5 #include "oops/oop.inline.hpp" 47.6 47.7 -int arrayKlass::static_size(int header_size) { 47.8 +int ArrayKlass::static_size(int header_size) { 47.9 // size of an array klass object 47.10 assert(header_size <= InstanceKlass::header_size(), "bad header size"); 47.11 // If this assert fails, see comments in base_create_array_klass. 47.12 @@ -51,7 +51,7 @@ 47.13 } 47.14 47.15 47.16 -Klass* arrayKlass::java_super() const { 47.17 +Klass* ArrayKlass::java_super() const { 47.18 if (super() == NULL) return NULL; // bootstrap case 47.19 // Array klasses have primary supertypes which are not reported to Java. 47.20 // Example super chain: String[][] -> Object[][] -> Object[] -> Object 47.21 @@ -59,18 +59,18 @@ 47.22 } 47.23 47.24 47.25 -oop arrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) { 47.26 +oop ArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) { 47.27 ShouldNotReachHere(); 47.28 return NULL; 47.29 } 47.30 47.31 -Method* arrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const { 47.32 +Method* ArrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const { 47.33 // There are no methods in an array klass but the super class (Object) has some 47.34 assert(super(), "super klass must be present"); 47.35 return Klass::cast(super())->uncached_lookup_method(name, signature); 47.36 } 47.37 47.38 -arrayKlass::arrayKlass(Symbol* name) { 47.39 +ArrayKlass::ArrayKlass(Symbol* name) { 47.40 set_alloc_size(0); 47.41 set_name(name); 47.42 47.43 @@ -89,15 +89,15 @@ 47.44 47.45 47.46 // Initialization of vtables and mirror object is done separatly from base_create_array_klass, 47.47 -// since a GC can happen. At this point all instance variables of the arrayKlass must be setup. 47.48 -void arrayKlass::complete_create_array_klass(arrayKlass* k, KlassHandle super_klass, TRAPS) { 47.49 +// since a GC can happen. At this point all instance variables of the ArrayKlass must be setup. 47.50 +void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS) { 47.51 ResourceMark rm(THREAD); 47.52 k->initialize_supers(super_klass(), CHECK); 47.53 k->vtable()->initialize_vtable(false, CHECK); 47.54 java_lang_Class::create_mirror(k, CHECK); 47.55 } 47.56 47.57 -GrowableArray<Klass*>* arrayKlass::compute_secondary_supers(int num_extra_slots) { 47.58 +GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) { 47.59 // interfaces = { cloneable_klass, serializable_klass }; 47.60 assert(num_extra_slots == 0, "sanity of primitive array type"); 47.61 // Must share this for correct bootstrapping! 47.62 @@ -105,7 +105,7 @@ 47.63 return NULL; 47.64 } 47.65 47.66 -bool arrayKlass::compute_is_subtype_of(Klass* k) { 47.67 +bool ArrayKlass::compute_is_subtype_of(Klass* k) { 47.68 // An array is a subtype of Serializable, Clonable, and Object 47.69 return k == SystemDictionary::Object_klass() 47.70 || k == SystemDictionary::Cloneable_klass() 47.71 @@ -113,19 +113,19 @@ 47.72 } 47.73 47.74 47.75 -inline intptr_t* arrayKlass::start_of_vtable() const { 47.76 +inline intptr_t* ArrayKlass::start_of_vtable() const { 47.77 // all vtables start at the same place, that's why we use InstanceKlass::header_size here 47.78 return ((intptr_t*)this) + InstanceKlass::header_size(); 47.79 } 47.80 47.81 47.82 -klassVtable* arrayKlass::vtable() const { 47.83 +klassVtable* ArrayKlass::vtable() const { 47.84 KlassHandle kh(Thread::current(), this); 47.85 return new klassVtable(kh, start_of_vtable(), vtable_length() / vtableEntry::size()); 47.86 } 47.87 47.88 47.89 -objArrayOop arrayKlass::allocate_arrayArray(int n, int length, TRAPS) { 47.90 +objArrayOop ArrayKlass::allocate_arrayArray(int n, int length, TRAPS) { 47.91 if (length < 0) { 47.92 THROW_0(vmSymbols::java_lang_NegativeArraySizeException()); 47.93 } 47.94 @@ -136,40 +136,40 @@ 47.95 } 47.96 int size = objArrayOopDesc::object_size(length); 47.97 Klass* k = array_klass(n+dimension(), CHECK_0); 47.98 - arrayKlass* ak = arrayKlass::cast(k); 47.99 + ArrayKlass* ak = ArrayKlass::cast(k); 47.100 objArrayOop o = 47.101 (objArrayOop)CollectedHeap::array_allocate(ak, size, length, CHECK_0); 47.102 // initialization to NULL not necessary, area already cleared 47.103 return o; 47.104 } 47.105 47.106 -void arrayKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) { 47.107 +void ArrayKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) { 47.108 Klass* k = this; 47.109 // Iterate over this array klass and all higher dimensions 47.110 while (k != NULL) { 47.111 f(k, CHECK); 47.112 - k = arrayKlass::cast(k)->higher_dimension(); 47.113 + k = ArrayKlass::cast(k)->higher_dimension(); 47.114 } 47.115 } 47.116 47.117 -void arrayKlass::array_klasses_do(void f(Klass* k)) { 47.118 +void ArrayKlass::array_klasses_do(void f(Klass* k)) { 47.119 Klass* k = this; 47.120 // Iterate over this array klass and all higher dimensions 47.121 while (k != NULL) { 47.122 f(k); 47.123 - k = arrayKlass::cast(k)->higher_dimension(); 47.124 + k = ArrayKlass::cast(k)->higher_dimension(); 47.125 } 47.126 } 47.127 47.128 47.129 -void arrayKlass::with_array_klasses_do(void f(Klass* k)) { 47.130 +void ArrayKlass::with_array_klasses_do(void f(Klass* k)) { 47.131 array_klasses_do(f); 47.132 } 47.133 47.134 47.135 // GC support 47.136 47.137 -void arrayKlass::oops_do(OopClosure* cl) { 47.138 +void ArrayKlass::oops_do(OopClosure* cl) { 47.139 Klass::oops_do(cl); 47.140 47.141 cl->do_oop(adr_component_mirror()); 47.142 @@ -177,42 +177,42 @@ 47.143 47.144 // JVM support 47.145 47.146 -jint arrayKlass::compute_modifier_flags(TRAPS) const { 47.147 +jint ArrayKlass::compute_modifier_flags(TRAPS) const { 47.148 return JVM_ACC_ABSTRACT | JVM_ACC_FINAL | JVM_ACC_PUBLIC; 47.149 } 47.150 47.151 // JVMTI support 47.152 47.153 -jint arrayKlass::jvmti_class_status() const { 47.154 +jint ArrayKlass::jvmti_class_status() const { 47.155 return JVMTI_CLASS_STATUS_ARRAY; 47.156 } 47.157 47.158 -void arrayKlass::remove_unshareable_info() { 47.159 +void ArrayKlass::remove_unshareable_info() { 47.160 Klass::remove_unshareable_info(); 47.161 // Clear the java mirror 47.162 set_component_mirror(NULL); 47.163 } 47.164 47.165 -void arrayKlass::restore_unshareable_info(TRAPS) { 47.166 +void ArrayKlass::restore_unshareable_info(TRAPS) { 47.167 Klass::restore_unshareable_info(CHECK); 47.168 // Klass recreates the component mirror also 47.169 } 47.170 47.171 // Printing 47.172 47.173 -void arrayKlass::print_on(outputStream* st) const { 47.174 +void ArrayKlass::print_on(outputStream* st) const { 47.175 assert(is_klass(), "must be klass"); 47.176 Klass::print_on(st); 47.177 } 47.178 47.179 -void arrayKlass::print_value_on(outputStream* st) const { 47.180 +void ArrayKlass::print_value_on(outputStream* st) const { 47.181 assert(is_klass(), "must be klass"); 47.182 for(int index = 0; index < dimension(); index++) { 47.183 st->print("[]"); 47.184 } 47.185 } 47.186 47.187 -void arrayKlass::oop_print_on(oop obj, outputStream* st) { 47.188 +void ArrayKlass::oop_print_on(oop obj, outputStream* st) { 47.189 assert(obj->is_array(), "must be array"); 47.190 Klass::oop_print_on(obj, st); 47.191 st->print_cr(" - length: %d", arrayOop(obj)->length()); 47.192 @@ -221,7 +221,7 @@ 47.193 47.194 // Verification 47.195 47.196 -void arrayKlass::verify_on(outputStream* st) { 47.197 +void ArrayKlass::verify_on(outputStream* st) { 47.198 Klass::verify_on(st); 47.199 47.200 if (component_mirror() != NULL) { 47.201 @@ -229,7 +229,7 @@ 47.202 } 47.203 } 47.204 47.205 -void arrayKlass::oop_verify_on(oop obj, outputStream* st) { 47.206 +void ArrayKlass::oop_verify_on(oop obj, outputStream* st) { 47.207 guarantee(obj->is_array(), "must be array"); 47.208 arrayOop a = arrayOop(obj); 47.209 guarantee(a->length() >= 0, "array with negative length?");
48.1 --- a/src/share/vm/oops/arrayKlass.hpp Fri Oct 05 13:37:08 2012 -0700 48.2 +++ b/src/share/vm/oops/arrayKlass.hpp Tue Oct 09 07:41:27 2012 +0200 48.3 @@ -30,9 +30,9 @@ 48.4 48.5 class klassVtable; 48.6 48.7 -// arrayKlass is the abstract baseclass for all array classes 48.8 +// ArrayKlass is the abstract baseclass for all array classes 48.9 48.10 -class arrayKlass: public Klass { 48.11 +class ArrayKlass: public Klass { 48.12 friend class VMStructs; 48.13 private: 48.14 int _dimension; // This is n'th-dimensional array. 48.15 @@ -46,8 +46,8 @@ 48.16 // Constructors 48.17 // The constructor with the Symbol argument does the real array 48.18 // initialization, the other is a dummy 48.19 - arrayKlass(Symbol* name); 48.20 - arrayKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for cds"); } 48.21 + ArrayKlass(Symbol* name); 48.22 + ArrayKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for cds"); } 48.23 48.24 public: 48.25 // Testing operation 48.26 @@ -80,7 +80,7 @@ 48.27 oop* adr_component_mirror() { return (oop*)&this->_component_mirror;} 48.28 48.29 // Compiler/Interpreter offset 48.30 - static ByteSize component_mirror_offset() { return in_ByteSize(offset_of(arrayKlass, _component_mirror)); } 48.31 + static ByteSize component_mirror_offset() { return in_ByteSize(offset_of(ArrayKlass, _component_mirror)); } 48.32 48.33 virtual Klass* java_super() const;//{ return SystemDictionary::Object_klass(); } 48.34 48.35 @@ -94,16 +94,16 @@ 48.36 Method* uncached_lookup_method(Symbol* name, Symbol* signature) const; 48.37 48.38 // Casting from Klass* 48.39 - static arrayKlass* cast(Klass* k) { 48.40 - assert(k->oop_is_array(), "cast to arrayKlass"); 48.41 - return (arrayKlass*) k; 48.42 + static ArrayKlass* cast(Klass* k) { 48.43 + assert(k->oop_is_array(), "cast to ArrayKlass"); 48.44 + return (ArrayKlass*) k; 48.45 } 48.46 48.47 GrowableArray<Klass*>* compute_secondary_supers(int num_extra_slots); 48.48 bool compute_is_subtype_of(Klass* k); 48.49 48.50 // Sizing 48.51 - static int header_size() { return sizeof(arrayKlass)/HeapWordSize; } 48.52 + static int header_size() { return sizeof(ArrayKlass)/HeapWordSize; } 48.53 static int static_size(int header_size); 48.54 48.55 // Java vtable 48.56 @@ -124,7 +124,7 @@ 48.57 virtual void oops_do(OopClosure* cl); 48.58 48.59 // Return a handle. 48.60 - static void complete_create_array_klass(arrayKlass* k, KlassHandle super_klass, TRAPS); 48.61 + static void complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS); 48.62 48.63 48.64 // jvm support
49.1 --- a/src/share/vm/oops/constantPool.cpp Fri Oct 05 13:37:08 2012 -0700 49.2 +++ b/src/share/vm/oops/constantPool.cpp Tue Oct 09 07:41:27 2012 +0200 49.3 @@ -533,7 +533,7 @@ 49.4 void ConstantPool::verify_constant_pool_resolve(constantPoolHandle this_oop, KlassHandle k, TRAPS) { 49.5 if (k->oop_is_instance() || k->oop_is_objArray()) { 49.6 instanceKlassHandle holder (THREAD, this_oop->pool_holder()); 49.7 - Klass* elem_oop = k->oop_is_instance() ? k() : objArrayKlass::cast(k())->bottom_klass(); 49.8 + Klass* elem_oop = k->oop_is_instance() ? k() : ObjArrayKlass::cast(k())->bottom_klass(); 49.9 KlassHandle element (THREAD, elem_oop); 49.10 49.11 // The element type could be a typeArray - we only need the access check if it is
50.1 --- a/src/share/vm/oops/constantPool.hpp Fri Oct 05 13:37:08 2012 -0700 50.2 +++ b/src/share/vm/oops/constantPool.hpp Tue Oct 09 07:41:27 2012 +0200 50.3 @@ -468,7 +468,7 @@ 50.4 assert(tag_at(which).is_string(), "Corrupted constant pool"); 50.5 // Must do an acquire here in case another thread resolved the klass 50.6 // behind our back, lest we later load stale values thru the oop. 50.7 - // we might want a volatile_obj_at in objArrayKlass. 50.8 + // we might want a volatile_obj_at in ObjArrayKlass. 50.9 int obj_index = cp_to_object_index(which); 50.10 return resolved_references()->obj_at(obj_index); 50.11 }
51.1 --- a/src/share/vm/oops/instanceKlass.cpp Fri Oct 05 13:37:08 2012 -0700 51.2 +++ b/src/share/vm/oops/instanceKlass.cpp Tue Oct 09 07:41:27 2012 +0200 51.3 @@ -989,13 +989,13 @@ 51.4 51.5 // Check if update has already taken place 51.6 if (this_oop->array_klasses() == NULL) { 51.7 - Klass* k = objArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL); 51.8 + Klass* k = ObjArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL); 51.9 this_oop->set_array_klasses(k); 51.10 } 51.11 } 51.12 } 51.13 // _this will always be set at this point 51.14 - objArrayKlass* oak = (objArrayKlass*)this_oop->array_klasses(); 51.15 + ObjArrayKlass* oak = (ObjArrayKlass*)this_oop->array_klasses(); 51.16 if (or_null) { 51.17 return oak->array_klass_or_null(n); 51.18 } 51.19 @@ -1224,12 +1224,12 @@ 51.20 51.21 void InstanceKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) { 51.22 if (array_klasses() != NULL) 51.23 - arrayKlass::cast(array_klasses())->array_klasses_do(f, THREAD); 51.24 + ArrayKlass::cast(array_klasses())->array_klasses_do(f, THREAD); 51.25 } 51.26 51.27 void InstanceKlass::array_klasses_do(void f(Klass* k)) { 51.28 if (array_klasses() != NULL) 51.29 - arrayKlass::cast(array_klasses())->array_klasses_do(f); 51.30 + ArrayKlass::cast(array_klasses())->array_klasses_do(f); 51.31 } 51.32 51.33 51.34 @@ -2310,7 +2310,7 @@ 51.35 Symbol* classname1 = Klass::cast(class1)->name(); 51.36 51.37 if (Klass::cast(class2)->oop_is_objArray()) { 51.38 - class2 = objArrayKlass::cast(class2)->bottom_klass(); 51.39 + class2 = ObjArrayKlass::cast(class2)->bottom_klass(); 51.40 } 51.41 oop classloader2; 51.42 if (Klass::cast(class2)->oop_is_instance()) {
52.1 --- a/src/share/vm/oops/klass.cpp Fri Oct 05 13:37:08 2012 -0700 52.2 +++ b/src/share/vm/oops/klass.cpp Tue Oct 09 07:41:27 2012 +0200 52.3 @@ -532,13 +532,13 @@ 52.4 52.5 52.6 Klass* Klass::array_klass_impl(bool or_null, int rank, TRAPS) { 52.7 - fatal("array_klass should be dispatched to InstanceKlass, objArrayKlass or typeArrayKlass"); 52.8 + fatal("array_klass should be dispatched to InstanceKlass, ObjArrayKlass or TypeArrayKlass"); 52.9 return NULL; 52.10 } 52.11 52.12 52.13 Klass* Klass::array_klass_impl(bool or_null, TRAPS) { 52.14 - fatal("array_klass should be dispatched to InstanceKlass, objArrayKlass or typeArrayKlass"); 52.15 + fatal("array_klass should be dispatched to InstanceKlass, ObjArrayKlass or TypeArrayKlass"); 52.16 return NULL; 52.17 } 52.18 52.19 @@ -674,7 +674,7 @@ 52.20 assert(i>=0 && i<((InstanceKlass*)this)->vtable_length()/vtableEntry::size(), "index out of bounds"); 52.21 } else { 52.22 assert(oop_is_array(), "Must be"); 52.23 - assert(i>=0 && i<((arrayKlass*)this)->vtable_length()/vtableEntry::size(), "index out of bounds"); 52.24 + assert(i>=0 && i<((ArrayKlass*)this)->vtable_length()/vtableEntry::size(), "index out of bounds"); 52.25 } 52.26 } 52.27
53.1 --- a/src/share/vm/oops/klassVtable.cpp Fri Oct 05 13:37:08 2012 -0700 53.2 +++ b/src/share/vm/oops/klassVtable.cpp Tue Oct 09 07:41:27 2012 +0200 53.3 @@ -1096,7 +1096,7 @@ 53.4 SystemDictionary::classes_do(do_class); 53.5 fixed = no_klasses * oopSize; // vtable length 53.6 // filler size is a conservative approximation 53.7 - filler = oopSize * (no_klasses - no_instance_klasses) * (sizeof(InstanceKlass) - sizeof(arrayKlass) - 1); 53.8 + filler = oopSize * (no_klasses - no_instance_klasses) * (sizeof(InstanceKlass) - sizeof(ArrayKlass) - 1); 53.9 entries = sizeof(vtableEntry) * sum_of_vtable_len; 53.10 array_entries = sizeof(vtableEntry) * sum_of_array_vtable_len; 53.11 }
54.1 --- a/src/share/vm/oops/klassVtable.hpp Fri Oct 05 13:37:08 2012 -0700 54.2 +++ b/src/share/vm/oops/klassVtable.hpp Tue Oct 09 07:41:27 2012 +0200 54.3 @@ -31,7 +31,7 @@ 54.4 #include "utilities/growableArray.hpp" 54.5 54.6 // A klassVtable abstracts the variable-length vtable that is embedded in InstanceKlass 54.7 -// and arrayKlass. klassVtable objects are used just as convenient transient accessors to the vtable, 54.8 +// and ArrayKlass. klassVtable objects are used just as convenient transient accessors to the vtable, 54.9 // not to actually hold the vtable data. 54.10 // Note: the klassVtable should not be accessed before the class has been verified 54.11 // (until that point, the vtable is uninitialized).
55.1 --- a/src/share/vm/oops/method.cpp Fri Oct 05 13:37:08 2012 -0700 55.2 +++ b/src/share/vm/oops/method.cpp Tue Oct 09 07:41:27 2012 +0200 55.3 @@ -1065,7 +1065,7 @@ 55.4 Klass* Method::check_non_bcp_klass(Klass* klass) { 55.5 if (klass != NULL && Klass::cast(klass)->class_loader() != NULL) { 55.6 if (Klass::cast(klass)->oop_is_objArray()) 55.7 - klass = objArrayKlass::cast(klass)->bottom_klass(); 55.8 + klass = ObjArrayKlass::cast(klass)->bottom_klass(); 55.9 return klass; 55.10 } 55.11 return NULL;
56.1 --- a/src/share/vm/oops/objArrayKlass.cpp Fri Oct 05 13:37:08 2012 -0700 56.2 +++ b/src/share/vm/oops/objArrayKlass.cpp Tue Oct 09 07:41:27 2012 +0200 56.3 @@ -56,16 +56,16 @@ 56.4 #include "oops/oop.pcgc.inline.hpp" 56.5 #endif 56.6 56.7 -objArrayKlass* objArrayKlass::allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS) { 56.8 - assert(objArrayKlass::header_size() <= InstanceKlass::header_size(), 56.9 +ObjArrayKlass* ObjArrayKlass::allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS) { 56.10 + assert(ObjArrayKlass::header_size() <= InstanceKlass::header_size(), 56.11 "array klasses must be same size as InstanceKlass"); 56.12 56.13 - int size = arrayKlass::static_size(objArrayKlass::header_size()); 56.14 + int size = ArrayKlass::static_size(ObjArrayKlass::header_size()); 56.15 56.16 - return new (loader_data, size, THREAD) objArrayKlass(n, klass_handle, name); 56.17 + return new (loader_data, size, THREAD) ObjArrayKlass(n, klass_handle, name); 56.18 } 56.19 56.20 -Klass* objArrayKlass::allocate_objArray_klass(ClassLoaderData* loader_data, 56.21 +Klass* ObjArrayKlass::allocate_objArray_klass(ClassLoaderData* loader_data, 56.22 int n, KlassHandle element_klass, TRAPS) { 56.23 56.24 // Eagerly allocate the direct array supertype. 56.25 @@ -145,7 +145,7 @@ 56.26 } 56.27 56.28 // Initialize instance variables 56.29 - objArrayKlass* oak = objArrayKlass::allocate(loader_data, n, element_klass, name, CHECK_0); 56.30 + ObjArrayKlass* oak = ObjArrayKlass::allocate(loader_data, n, element_klass, name, CHECK_0); 56.31 56.32 // Add all classes to our internal class loader list here, 56.33 // including classes in the bootstrap (NULL) class loader. 56.34 @@ -153,12 +153,12 @@ 56.35 loader_data->add_class(oak); 56.36 56.37 // Call complete_create_array_klass after all instance variables has been initialized. 56.38 - arrayKlass::complete_create_array_klass(oak, super_klass, CHECK_0); 56.39 + ArrayKlass::complete_create_array_klass(oak, super_klass, CHECK_0); 56.40 56.41 return oak; 56.42 } 56.43 56.44 -objArrayKlass::objArrayKlass(int n, KlassHandle element_klass, Symbol* name) : arrayKlass(name) { 56.45 +ObjArrayKlass::ObjArrayKlass(int n, KlassHandle element_klass, Symbol* name) : ArrayKlass(name) { 56.46 this->set_dimension(n); 56.47 this->set_element_klass(element_klass()); 56.48 // decrement refcount because object arrays are not explicitly freed. The 56.49 @@ -168,7 +168,7 @@ 56.50 56.51 Klass* bk; 56.52 if (element_klass->oop_is_objArray()) { 56.53 - bk = objArrayKlass::cast(element_klass())->bottom_klass(); 56.54 + bk = ObjArrayKlass::cast(element_klass())->bottom_klass(); 56.55 } else { 56.56 bk = element_klass(); 56.57 } 56.58 @@ -181,12 +181,12 @@ 56.59 assert(this->oop_is_objArray(), "sanity"); 56.60 } 56.61 56.62 -int objArrayKlass::oop_size(oop obj) const { 56.63 +int ObjArrayKlass::oop_size(oop obj) const { 56.64 assert(obj->is_objArray(), "must be object array"); 56.65 return objArrayOop(obj)->object_size(); 56.66 } 56.67 56.68 -objArrayOop objArrayKlass::allocate(int length, TRAPS) { 56.69 +objArrayOop ObjArrayKlass::allocate(int length, TRAPS) { 56.70 if (length >= 0) { 56.71 if (length <= arrayOopDesc::max_array_length(T_OBJECT)) { 56.72 int size = objArrayOopDesc::object_size(length); 56.73 @@ -204,7 +204,7 @@ 56.74 56.75 static int multi_alloc_counter = 0; 56.76 56.77 -oop objArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) { 56.78 +oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) { 56.79 int length = *sizes; 56.80 // Call to lower_dimension uses this pointer, so most be called before a 56.81 // possible GC 56.82 @@ -215,7 +215,7 @@ 56.83 if (rank > 1) { 56.84 if (length != 0) { 56.85 for (int index = 0; index < length; index++) { 56.86 - arrayKlass* ak = arrayKlass::cast(h_lower_dimension()); 56.87 + ArrayKlass* ak = ArrayKlass::cast(h_lower_dimension()); 56.88 oop sub_array = ak->multi_allocate(rank-1, &sizes[1], CHECK_NULL); 56.89 h_array->obj_at_put(index, sub_array); 56.90 } 56.91 @@ -235,7 +235,7 @@ 56.92 } 56.93 56.94 // Either oop or narrowOop depending on UseCompressedOops. 56.95 -template <class T> void objArrayKlass::do_copy(arrayOop s, T* src, 56.96 +template <class T> void ObjArrayKlass::do_copy(arrayOop s, T* src, 56.97 arrayOop d, T* dst, int length, TRAPS) { 56.98 56.99 BarrierSet* bs = Universe::heap()->barrier_set(); 56.100 @@ -252,8 +252,8 @@ 56.101 Copy::conjoint_oops_atomic(src, dst, length); 56.102 } else { 56.103 // We have to make sure all elements conform to the destination array 56.104 - Klass* bound = objArrayKlass::cast(d->klass())->element_klass(); 56.105 - Klass* stype = objArrayKlass::cast(s->klass())->element_klass(); 56.106 + Klass* bound = ObjArrayKlass::cast(d->klass())->element_klass(); 56.107 + Klass* stype = ObjArrayKlass::cast(s->klass())->element_klass(); 56.108 if (stype == bound || Klass::cast(stype)->is_subtype_of(bound)) { 56.109 // elements are guaranteed to be subtypes, so no check necessary 56.110 bs->write_ref_array_pre(dst, length); 56.111 @@ -290,7 +290,7 @@ 56.112 bs->write_ref_array((HeapWord*)dst, length); 56.113 } 56.114 56.115 -void objArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d, 56.116 +void ObjArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d, 56.117 int dst_pos, int length, TRAPS) { 56.118 assert(s->is_objArray(), "must be obj array"); 56.119 56.120 @@ -327,7 +327,7 @@ 56.121 } 56.122 56.123 56.124 -Klass* objArrayKlass::array_klass_impl(bool or_null, int n, TRAPS) { 56.125 +Klass* ObjArrayKlass::array_klass_impl(bool or_null, int n, TRAPS) { 56.126 56.127 assert(dimension() <= n, "check order of chain"); 56.128 int dim = dimension(); 56.129 @@ -348,30 +348,30 @@ 56.130 56.131 // Create multi-dim klass object and link them together 56.132 Klass* k = 56.133 - objArrayKlass::allocate_objArray_klass(class_loader_data(), dim + 1, this, CHECK_NULL); 56.134 - objArrayKlass* ak = objArrayKlass::cast(k); 56.135 + ObjArrayKlass::allocate_objArray_klass(class_loader_data(), dim + 1, this, CHECK_NULL); 56.136 + ObjArrayKlass* ak = ObjArrayKlass::cast(k); 56.137 ak->set_lower_dimension(this); 56.138 OrderAccess::storestore(); 56.139 set_higher_dimension(ak); 56.140 - assert(ak->oop_is_objArray(), "incorrect initialization of objArrayKlass"); 56.141 + assert(ak->oop_is_objArray(), "incorrect initialization of ObjArrayKlass"); 56.142 } 56.143 } 56.144 } else { 56.145 CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops()); 56.146 } 56.147 56.148 - objArrayKlass *ak = objArrayKlass::cast(higher_dimension()); 56.149 + ObjArrayKlass *ak = ObjArrayKlass::cast(higher_dimension()); 56.150 if (or_null) { 56.151 return ak->array_klass_or_null(n); 56.152 } 56.153 return ak->array_klass(n, CHECK_NULL); 56.154 } 56.155 56.156 -Klass* objArrayKlass::array_klass_impl(bool or_null, TRAPS) { 56.157 +Klass* ObjArrayKlass::array_klass_impl(bool or_null, TRAPS) { 56.158 return array_klass_impl(or_null, dimension() + 1, CHECK_NULL); 56.159 } 56.160 56.161 -bool objArrayKlass::can_be_primary_super_slow() const { 56.162 +bool ObjArrayKlass::can_be_primary_super_slow() const { 56.163 if (!bottom_klass()->can_be_primary_super()) 56.164 // array of interfaces 56.165 return false; 56.166 @@ -379,7 +379,7 @@ 56.167 return Klass::can_be_primary_super_slow(); 56.168 } 56.169 56.170 -GrowableArray<Klass*>* objArrayKlass::compute_secondary_supers(int num_extra_slots) { 56.171 +GrowableArray<Klass*>* ObjArrayKlass::compute_secondary_supers(int num_extra_slots) { 56.172 // interfaces = { cloneable_klass, serializable_klass, elemSuper[], ... }; 56.173 Array<Klass*>* elem_supers = Klass::cast(element_klass())->secondary_supers(); 56.174 int num_elem_supers = elem_supers == NULL ? 0 : elem_supers->length(); 56.175 @@ -402,16 +402,16 @@ 56.176 } 56.177 } 56.178 56.179 -bool objArrayKlass::compute_is_subtype_of(Klass* k) { 56.180 +bool ObjArrayKlass::compute_is_subtype_of(Klass* k) { 56.181 if (!k->oop_is_objArray()) 56.182 - return arrayKlass::compute_is_subtype_of(k); 56.183 + return ArrayKlass::compute_is_subtype_of(k); 56.184 56.185 - objArrayKlass* oak = objArrayKlass::cast(k); 56.186 + ObjArrayKlass* oak = ObjArrayKlass::cast(k); 56.187 return element_klass()->is_subtype_of(oak->element_klass()); 56.188 } 56.189 56.190 -void objArrayKlass::initialize(TRAPS) { 56.191 - Klass::cast(bottom_klass())->initialize(THREAD); // dispatches to either InstanceKlass or typeArrayKlass 56.192 +void ObjArrayKlass::initialize(TRAPS) { 56.193 + Klass::cast(bottom_klass())->initialize(THREAD); // dispatches to either InstanceKlass or TypeArrayKlass 56.194 } 56.195 56.196 #define ObjArrayKlass_SPECIALIZED_OOP_ITERATE(T, a, p, do_oop) \ 56.197 @@ -456,7 +456,7 @@ 56.198 a, p, low, high, do_oop) \ 56.199 } 56.200 56.201 -void objArrayKlass::oop_follow_contents(oop obj) { 56.202 +void ObjArrayKlass::oop_follow_contents(oop obj) { 56.203 assert (obj->is_array(), "obj must be array"); 56.204 MarkSweep::follow_klass(obj->klass()); 56.205 if (UseCompressedOops) { 56.206 @@ -467,7 +467,7 @@ 56.207 } 56.208 56.209 #ifndef SERIALGC 56.210 -void objArrayKlass::oop_follow_contents(ParCompactionManager* cm, 56.211 +void ObjArrayKlass::oop_follow_contents(ParCompactionManager* cm, 56.212 oop obj) { 56.213 assert(obj->is_array(), "obj must be array"); 56.214 PSParallelCompact::follow_klass(cm, obj->klass()); 56.215 @@ -487,7 +487,7 @@ 56.216 56.217 #define ObjArrayKlass_OOP_OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \ 56.218 \ 56.219 -int objArrayKlass::oop_oop_iterate##nv_suffix(oop obj, \ 56.220 +int ObjArrayKlass::oop_oop_iterate##nv_suffix(oop obj, \ 56.221 OopClosureType* closure) { \ 56.222 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::oa); \ 56.223 assert (obj->is_array(), "obj must be array"); \ 56.224 @@ -504,7 +504,7 @@ 56.225 56.226 #define ObjArrayKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \ 56.227 \ 56.228 -int objArrayKlass::oop_oop_iterate##nv_suffix##_m(oop obj, \ 56.229 +int ObjArrayKlass::oop_oop_iterate##nv_suffix##_m(oop obj, \ 56.230 OopClosureType* closure, \ 56.231 MemRegion mr) { \ 56.232 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::oa); \ 56.233 @@ -526,7 +526,7 @@ 56.234 // for objArrayOops. 56.235 #define ObjArrayKlass_OOP_OOP_ITERATE_DEFN_r(OopClosureType, nv_suffix) \ 56.236 \ 56.237 -int objArrayKlass::oop_oop_iterate_range##nv_suffix(oop obj, \ 56.238 +int ObjArrayKlass::oop_oop_iterate_range##nv_suffix(oop obj, \ 56.239 OopClosureType* closure, \ 56.240 int start, int end) { \ 56.241 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::oa); \ 56.242 @@ -567,7 +567,7 @@ 56.243 ALL_OOP_OOP_ITERATE_CLOSURES_1(ObjArrayKlass_OOP_OOP_ITERATE_DEFN_r) 56.244 ALL_OOP_OOP_ITERATE_CLOSURES_2(ObjArrayKlass_OOP_OOP_ITERATE_DEFN_r) 56.245 56.246 -int objArrayKlass::oop_adjust_pointers(oop obj) { 56.247 +int ObjArrayKlass::oop_adjust_pointers(oop obj) { 56.248 assert(obj->is_objArray(), "obj must be obj array"); 56.249 objArrayOop a = objArrayOop(obj); 56.250 // Get size before changing pointers. 56.251 @@ -579,7 +579,7 @@ 56.252 } 56.253 56.254 #ifndef SERIALGC 56.255 -void objArrayKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { 56.256 +void ObjArrayKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { 56.257 assert(obj->is_objArray(), "obj must be obj array"); 56.258 ObjArrayKlass_OOP_ITERATE( \ 56.259 objArrayOop(obj), p, \ 56.260 @@ -588,7 +588,7 @@ 56.261 }) 56.262 } 56.263 56.264 -int objArrayKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { 56.265 +int ObjArrayKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { 56.266 assert (obj->is_objArray(), "obj must be obj array"); 56.267 objArrayOop a = objArrayOop(obj); 56.268 int size = a->object_size(); 56.269 @@ -600,7 +600,7 @@ 56.270 56.271 // JVM support 56.272 56.273 -jint objArrayKlass::compute_modifier_flags(TRAPS) const { 56.274 +jint ObjArrayKlass::compute_modifier_flags(TRAPS) const { 56.275 // The modifier for an objectArray is the same as its element 56.276 if (element_klass() == NULL) { 56.277 assert(Universe::is_bootstrapping(), "partial objArray only at startup"); 56.278 @@ -616,7 +616,7 @@ 56.279 56.280 // Printing 56.281 56.282 -void objArrayKlass::print_on(outputStream* st) const { 56.283 +void ObjArrayKlass::print_on(outputStream* st) const { 56.284 #ifndef PRODUCT 56.285 Klass::print_on(st); 56.286 st->print(" - instance klass: "); 56.287 @@ -625,7 +625,7 @@ 56.288 #endif //PRODUCT 56.289 } 56.290 56.291 -void objArrayKlass::print_value_on(outputStream* st) const { 56.292 +void ObjArrayKlass::print_value_on(outputStream* st) const { 56.293 assert(is_klass(), "must be klass"); 56.294 56.295 element_klass()->print_value_on(st); 56.296 @@ -634,8 +634,8 @@ 56.297 56.298 #ifndef PRODUCT 56.299 56.300 -void objArrayKlass::oop_print_on(oop obj, outputStream* st) { 56.301 - arrayKlass::oop_print_on(obj, st); 56.302 +void ObjArrayKlass::oop_print_on(oop obj, outputStream* st) { 56.303 + ArrayKlass::oop_print_on(obj, st); 56.304 assert(obj->is_objArray(), "must be objArray"); 56.305 objArrayOop oa = objArrayOop(obj); 56.306 int print_len = MIN2((intx) oa->length(), MaxElementPrintSize); 56.307 @@ -654,7 +654,7 @@ 56.308 56.309 static int max_objArray_print_length = 4; 56.310 56.311 -void objArrayKlass::oop_print_value_on(oop obj, outputStream* st) { 56.312 +void ObjArrayKlass::oop_print_value_on(oop obj, outputStream* st) { 56.313 assert(obj->is_objArray(), "must be objArray"); 56.314 st->print("a "); 56.315 element_klass()->print_value_on(st); 56.316 @@ -673,15 +673,15 @@ 56.317 } 56.318 } 56.319 56.320 -const char* objArrayKlass::internal_name() const { 56.321 +const char* ObjArrayKlass::internal_name() const { 56.322 return external_name(); 56.323 } 56.324 56.325 56.326 // Verification 56.327 56.328 -void objArrayKlass::verify_on(outputStream* st) { 56.329 - arrayKlass::verify_on(st); 56.330 +void ObjArrayKlass::verify_on(outputStream* st) { 56.331 + ArrayKlass::verify_on(st); 56.332 guarantee(element_klass()->is_metadata(), "should be in metaspace"); 56.333 guarantee(element_klass()->is_klass(), "should be klass"); 56.334 guarantee(bottom_klass()->is_metadata(), "should be in metaspace"); 56.335 @@ -690,8 +690,8 @@ 56.336 guarantee(bk->oop_is_instance() || bk->oop_is_typeArray(), "invalid bottom klass"); 56.337 } 56.338 56.339 -void objArrayKlass::oop_verify_on(oop obj, outputStream* st) { 56.340 - arrayKlass::oop_verify_on(obj, st); 56.341 +void ObjArrayKlass::oop_verify_on(oop obj, outputStream* st) { 56.342 + ArrayKlass::oop_verify_on(obj, st); 56.343 guarantee(obj->is_objArray(), "must be objArray"); 56.344 objArrayOop oa = objArrayOop(obj); 56.345 for(int index = 0; index < oa->length(); index++) {
57.1 --- a/src/share/vm/oops/objArrayKlass.hpp Fri Oct 05 13:37:08 2012 -0700 57.2 +++ b/src/share/vm/oops/objArrayKlass.hpp Tue Oct 09 07:41:27 2012 +0200 57.3 @@ -29,20 +29,20 @@ 57.4 #include "memory/specialized_oop_closures.hpp" 57.5 #include "oops/arrayKlass.hpp" 57.6 57.7 -// objArrayKlass is the klass for objArrays 57.8 +// ObjArrayKlass is the klass for objArrays 57.9 57.10 -class objArrayKlass : public arrayKlass { 57.11 +class ObjArrayKlass : public ArrayKlass { 57.12 friend class VMStructs; 57.13 private: 57.14 Klass* _element_klass; // The klass of the elements of this array type 57.15 - Klass* _bottom_klass; // The one-dimensional type (InstanceKlass or typeArrayKlass) 57.16 + Klass* _bottom_klass; // The one-dimensional type (InstanceKlass or TypeArrayKlass) 57.17 57.18 // Constructor 57.19 - objArrayKlass(int n, KlassHandle element_klass, Symbol* name); 57.20 - static objArrayKlass* allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS); 57.21 + ObjArrayKlass(int n, KlassHandle element_klass, Symbol* name); 57.22 + static ObjArrayKlass* allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS); 57.23 public: 57.24 // For dummy objects 57.25 - objArrayKlass() {} 57.26 + ObjArrayKlass() {} 57.27 57.28 // Instance variables 57.29 Klass* element_klass() const { return _element_klass; } 57.30 @@ -54,7 +54,7 @@ 57.31 Klass** bottom_klass_addr() { return &_bottom_klass; } 57.32 57.33 // Compiler/Interpreter offset 57.34 - static ByteSize element_klass_offset() { return in_ByteSize(offset_of(objArrayKlass, _element_klass)); } 57.35 + static ByteSize element_klass_offset() { return in_ByteSize(offset_of(ObjArrayKlass, _element_klass)); } 57.36 57.37 // Dispatched operation 57.38 bool can_be_primary_super_slow() const; 57.39 @@ -78,11 +78,11 @@ 57.40 57.41 private: 57.42 // Either oop or narrowOop depending on UseCompressedOops. 57.43 - // must be called from within objArrayKlass.cpp 57.44 + // must be called from within ObjArrayKlass.cpp 57.45 template <class T> void do_copy(arrayOop s, T* src, arrayOop d, 57.46 T* dst, int length, TRAPS); 57.47 protected: 57.48 - // Returns the objArrayKlass for n'th dimension. 57.49 + // Returns the ObjArrayKlass for n'th dimension. 57.50 virtual Klass* array_klass_impl(bool or_null, int n, TRAPS); 57.51 57.52 // Returns the array class with this class as element type. 57.53 @@ -90,14 +90,14 @@ 57.54 57.55 public: 57.56 // Casting from Klass* 57.57 - static objArrayKlass* cast(Klass* k) { 57.58 - assert(k->oop_is_objArray(), "cast to objArrayKlass"); 57.59 - return (objArrayKlass*) k; 57.60 + static ObjArrayKlass* cast(Klass* k) { 57.61 + assert(k->oop_is_objArray(), "cast to ObjArrayKlass"); 57.62 + return (ObjArrayKlass*) k; 57.63 } 57.64 57.65 // Sizing 57.66 - static int header_size() { return sizeof(objArrayKlass)/HeapWordSize; } 57.67 - int size() const { return arrayKlass::static_size(header_size()); } 57.68 + static int header_size() { return sizeof(ObjArrayKlass)/HeapWordSize; } 57.69 + int size() const { return ArrayKlass::static_size(header_size()); } 57.70 57.71 // Initialization (virtual from Klass) 57.72 void initialize(TRAPS);
58.1 --- a/src/share/vm/oops/objArrayKlass.inline.hpp Fri Oct 05 13:37:08 2012 -0700 58.2 +++ b/src/share/vm/oops/objArrayKlass.inline.hpp Tue Oct 09 07:41:27 2012 +0200 58.3 @@ -32,7 +32,7 @@ 58.4 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp" 58.5 #endif 58.6 58.7 -void objArrayKlass::oop_follow_contents(oop obj, int index) { 58.8 +void ObjArrayKlass::oop_follow_contents(oop obj, int index) { 58.9 if (UseCompressedOops) { 58.10 objarray_follow_contents<narrowOop>(obj, index); 58.11 } else { 58.12 @@ -41,7 +41,7 @@ 58.13 } 58.14 58.15 template <class T> 58.16 -void objArrayKlass::objarray_follow_contents(oop obj, int index) { 58.17 +void ObjArrayKlass::objarray_follow_contents(oop obj, int index) { 58.18 objArrayOop a = objArrayOop(obj); 58.19 const size_t len = size_t(a->length()); 58.20 const size_t beg_index = size_t(index); 58.21 @@ -64,7 +64,7 @@ 58.22 } 58.23 58.24 #ifndef SERIALGC 58.25 -void objArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj, 58.26 +void ObjArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj, 58.27 int index) { 58.28 if (UseCompressedOops) { 58.29 objarray_follow_contents<narrowOop>(cm, obj, index); 58.30 @@ -74,7 +74,7 @@ 58.31 } 58.32 58.33 template <class T> 58.34 -void objArrayKlass::objarray_follow_contents(ParCompactionManager* cm, oop obj, 58.35 +void ObjArrayKlass::objarray_follow_contents(ParCompactionManager* cm, oop obj, 58.36 int index) { 58.37 objArrayOop a = objArrayOop(obj); 58.38 const size_t len = size_t(a->length());
59.1 --- a/src/share/vm/oops/objArrayOop.cpp Fri Oct 05 13:37:08 2012 -0700 59.2 +++ b/src/share/vm/oops/objArrayOop.cpp Tue Oct 09 07:41:27 2012 +0200 59.3 @@ -31,7 +31,7 @@ 59.4 \ 59.5 int objArrayOopDesc::oop_iterate_range(OopClosureType* blk, int start, int end) { \ 59.6 SpecializationStats::record_call(); \ 59.7 - return ((objArrayKlass*)klass())->oop_oop_iterate_range##nv_suffix(this, blk, start, end); \ 59.8 + return ((ObjArrayKlass*)klass())->oop_oop_iterate_range##nv_suffix(this, blk, start, end); \ 59.9 } 59.10 59.11 ALL_OOP_OOP_ITERATE_CLOSURES_1(ObjArrayOop_OOP_ITERATE_DEFN)
60.1 --- a/src/share/vm/oops/objArrayOop.hpp Fri Oct 05 13:37:08 2012 -0700 60.2 +++ b/src/share/vm/oops/objArrayOop.hpp Tue Oct 09 07:41:27 2012 +0200 60.3 @@ -31,7 +31,7 @@ 60.4 // Evaluating "String arg[10]" will create an objArrayOop. 60.5 60.6 class objArrayOopDesc : public arrayOopDesc { 60.7 - friend class objArrayKlass; 60.8 + friend class ObjArrayKlass; 60.9 friend class Runtime1; 60.10 friend class psPromotionManager; 60.11 friend class CSetMarkOopClosure;
61.1 --- a/src/share/vm/oops/oop.pcgc.inline.hpp Fri Oct 05 13:37:08 2012 -0700 61.2 +++ b/src/share/vm/oops/oop.pcgc.inline.hpp Tue Oct 09 07:41:27 2012 +0200 61.3 @@ -44,7 +44,7 @@ 61.4 // It might contain oops beyond the header, so take the virtual call. 61.5 new_klass->oop_update_pointers(cm, this); 61.6 } 61.7 - // Else skip it. The typeArrayKlass in the header never needs scavenging. 61.8 + // Else skip it. The TypeArrayKlass in the header never needs scavenging. 61.9 } 61.10 61.11 inline void oopDesc::follow_contents(ParCompactionManager* cm) {
62.1 --- a/src/share/vm/oops/oop.psgc.inline.hpp Fri Oct 05 13:37:08 2012 -0700 62.2 +++ b/src/share/vm/oops/oop.psgc.inline.hpp Tue Oct 09 07:41:27 2012 +0200 62.3 @@ -39,7 +39,7 @@ 62.4 // It might contain oops beyond the header, so take the virtual call. 62.5 k->oop_push_contents(pm, this); 62.6 } 62.7 - // Else skip it. The typeArrayKlass in the header never needs scavenging. 62.8 + // Else skip it. The TypeArrayKlass in the header never needs scavenging. 62.9 } 62.10 62.11 #endif // SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP
63.1 --- a/src/share/vm/oops/oopsHierarchy.hpp Fri Oct 05 13:37:08 2012 -0700 63.2 +++ b/src/share/vm/oops/oopsHierarchy.hpp Tue Oct 09 07:41:27 2012 +0200 63.3 @@ -128,7 +128,7 @@ 63.4 #endif 63.5 63.6 // from parNewGeneration and other things that want to get to the end of 63.7 - // an oop for stuff (like objArrayKlass.cpp) 63.8 + // an oop for stuff (like ObjArrayKlass.cpp) 63.9 operator oop* () const { return (oop *)obj(); } 63.10 }; 63.11 63.12 @@ -172,8 +172,8 @@ 63.13 class InstanceMirrorKlass; 63.14 class InstanceClassLoaderKlass; 63.15 class InstanceRefKlass; 63.16 -class arrayKlass; 63.17 -class objArrayKlass; 63.18 -class typeArrayKlass; 63.19 +class ArrayKlass; 63.20 +class ObjArrayKlass; 63.21 +class TypeArrayKlass; 63.22 63.23 #endif // SHARE_VM_OOPS_OOPSHIERARCHY_HPP
64.1 --- a/src/share/vm/oops/typeArrayKlass.cpp Fri Oct 05 13:37:08 2012 -0700 64.2 +++ b/src/share/vm/oops/typeArrayKlass.cpp Tue Oct 09 07:41:27 2012 +0200 64.3 @@ -40,18 +40,18 @@ 64.4 #include "oops/typeArrayOop.hpp" 64.5 #include "runtime/handles.inline.hpp" 64.6 64.7 -bool typeArrayKlass::compute_is_subtype_of(Klass* k) { 64.8 +bool TypeArrayKlass::compute_is_subtype_of(Klass* k) { 64.9 if (!k->oop_is_typeArray()) { 64.10 - return arrayKlass::compute_is_subtype_of(k); 64.11 + return ArrayKlass::compute_is_subtype_of(k); 64.12 } 64.13 64.14 - typeArrayKlass* tak = typeArrayKlass::cast(k); 64.15 + TypeArrayKlass* tak = TypeArrayKlass::cast(k); 64.16 if (dimension() != tak->dimension()) return false; 64.17 64.18 return element_type() == tak->element_type(); 64.19 } 64.20 64.21 -typeArrayKlass* typeArrayKlass::create_klass(BasicType type, 64.22 +TypeArrayKlass* TypeArrayKlass::create_klass(BasicType type, 64.23 const char* name_str, TRAPS) { 64.24 Symbol* sym = NULL; 64.25 if (name_str != NULL) { 64.26 @@ -60,7 +60,7 @@ 64.27 64.28 ClassLoaderData* null_loader_data = ClassLoaderData::the_null_class_loader_data(); 64.29 64.30 - typeArrayKlass* ak = typeArrayKlass::allocate(null_loader_data, type, sym, CHECK_NULL); 64.31 + TypeArrayKlass* ak = TypeArrayKlass::allocate(null_loader_data, type, sym, CHECK_NULL); 64.32 64.33 // Add all classes to our internal class loader list here, 64.34 // including classes in the bootstrap (NULL) class loader. 64.35 @@ -73,27 +73,27 @@ 64.36 return ak; 64.37 } 64.38 64.39 -typeArrayKlass* typeArrayKlass::allocate(ClassLoaderData* loader_data, BasicType type, Symbol* name, TRAPS) { 64.40 - assert(typeArrayKlass::header_size() <= InstanceKlass::header_size(), 64.41 +TypeArrayKlass* TypeArrayKlass::allocate(ClassLoaderData* loader_data, BasicType type, Symbol* name, TRAPS) { 64.42 + assert(TypeArrayKlass::header_size() <= InstanceKlass::header_size(), 64.43 "array klasses must be same size as InstanceKlass"); 64.44 64.45 - int size = arrayKlass::static_size(typeArrayKlass::header_size()); 64.46 + int size = ArrayKlass::static_size(TypeArrayKlass::header_size()); 64.47 64.48 - return new (loader_data, size, THREAD) typeArrayKlass(type, name); 64.49 + return new (loader_data, size, THREAD) TypeArrayKlass(type, name); 64.50 } 64.51 64.52 -typeArrayKlass::typeArrayKlass(BasicType type, Symbol* name) : arrayKlass(name) { 64.53 +TypeArrayKlass::TypeArrayKlass(BasicType type, Symbol* name) : ArrayKlass(name) { 64.54 set_layout_helper(array_layout_helper(type)); 64.55 assert(oop_is_array(), "sanity"); 64.56 assert(oop_is_typeArray(), "sanity"); 64.57 64.58 set_max_length(arrayOopDesc::max_array_length(type)); 64.59 - assert(size() >= typeArrayKlass::header_size(), "bad size"); 64.60 + assert(size() >= TypeArrayKlass::header_size(), "bad size"); 64.61 64.62 set_class_loader_data(ClassLoaderData::the_null_class_loader_data()); 64.63 } 64.64 64.65 -typeArrayOop typeArrayKlass::allocate_common(int length, bool do_zero, TRAPS) { 64.66 +typeArrayOop TypeArrayKlass::allocate_common(int length, bool do_zero, TRAPS) { 64.67 assert(log2_element_size() >= 0, "bad scale"); 64.68 if (length >= 0) { 64.69 if (length <= max_length()) { 64.70 @@ -117,7 +117,7 @@ 64.71 } 64.72 } 64.73 64.74 -oop typeArrayKlass::multi_allocate(int rank, jint* last_size, TRAPS) { 64.75 +oop TypeArrayKlass::multi_allocate(int rank, jint* last_size, TRAPS) { 64.76 // For typeArrays this is only called for the last dimension 64.77 assert(rank == 1, "just checking"); 64.78 int length = *last_size; 64.79 @@ -125,11 +125,11 @@ 64.80 } 64.81 64.82 64.83 -void typeArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS) { 64.84 +void TypeArrayKlass::copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS) { 64.85 assert(s->is_typeArray(), "must be type array"); 64.86 64.87 // Check destination 64.88 - if (!d->is_typeArray() || element_type() != typeArrayKlass::cast(d->klass())->element_type()) { 64.89 + if (!d->is_typeArray() || element_type() != TypeArrayKlass::cast(d->klass())->element_type()) { 64.90 THROW(vmSymbols::java_lang_ArrayStoreException()); 64.91 } 64.92 64.93 @@ -156,7 +156,7 @@ 64.94 64.95 64.96 // create a klass of array holding typeArrays 64.97 -Klass* typeArrayKlass::array_klass_impl(bool or_null, int n, TRAPS) { 64.98 +Klass* TypeArrayKlass::array_klass_impl(bool or_null, int n, TRAPS) { 64.99 int dim = dimension(); 64.100 assert(dim <= n, "check order of chain"); 64.101 if (dim == n) 64.102 @@ -173,92 +173,92 @@ 64.103 MutexLocker mu(MultiArray_lock, THREAD); 64.104 64.105 if (higher_dimension() == NULL) { 64.106 - Klass* oak = objArrayKlass::allocate_objArray_klass( 64.107 + Klass* oak = ObjArrayKlass::allocate_objArray_klass( 64.108 class_loader_data(), dim + 1, this, CHECK_NULL); 64.109 - objArrayKlass* h_ak = objArrayKlass::cast(oak); 64.110 + ObjArrayKlass* h_ak = ObjArrayKlass::cast(oak); 64.111 h_ak->set_lower_dimension(this); 64.112 OrderAccess::storestore(); 64.113 set_higher_dimension(h_ak); 64.114 - assert(h_ak->oop_is_objArray(), "incorrect initialization of objArrayKlass"); 64.115 + assert(h_ak->oop_is_objArray(), "incorrect initialization of ObjArrayKlass"); 64.116 } 64.117 } 64.118 } else { 64.119 CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops()); 64.120 } 64.121 - objArrayKlass* h_ak = objArrayKlass::cast(higher_dimension()); 64.122 + ObjArrayKlass* h_ak = ObjArrayKlass::cast(higher_dimension()); 64.123 if (or_null) { 64.124 return h_ak->array_klass_or_null(n); 64.125 } 64.126 return h_ak->array_klass(n, CHECK_NULL); 64.127 } 64.128 64.129 -Klass* typeArrayKlass::array_klass_impl(bool or_null, TRAPS) { 64.130 +Klass* TypeArrayKlass::array_klass_impl(bool or_null, TRAPS) { 64.131 return array_klass_impl(or_null, dimension() + 1, THREAD); 64.132 } 64.133 64.134 -int typeArrayKlass::oop_size(oop obj) const { 64.135 +int TypeArrayKlass::oop_size(oop obj) const { 64.136 assert(obj->is_typeArray(),"must be a type array"); 64.137 typeArrayOop t = typeArrayOop(obj); 64.138 return t->object_size(); 64.139 } 64.140 64.141 -void typeArrayKlass::oop_follow_contents(oop obj) { 64.142 +void TypeArrayKlass::oop_follow_contents(oop obj) { 64.143 assert(obj->is_typeArray(),"must be a type array"); 64.144 // Performance tweak: We skip iterating over the klass pointer since we 64.145 - // know that Universe::typeArrayKlass never moves. 64.146 + // know that Universe::TypeArrayKlass never moves. 64.147 } 64.148 64.149 #ifndef SERIALGC 64.150 -void typeArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj) { 64.151 +void TypeArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj) { 64.152 assert(obj->is_typeArray(),"must be a type array"); 64.153 // Performance tweak: We skip iterating over the klass pointer since we 64.154 - // know that Universe::typeArrayKlass never moves. 64.155 + // know that Universe::TypeArrayKlass never moves. 64.156 } 64.157 #endif // SERIALGC 64.158 64.159 -int typeArrayKlass::oop_adjust_pointers(oop obj) { 64.160 +int TypeArrayKlass::oop_adjust_pointers(oop obj) { 64.161 assert(obj->is_typeArray(),"must be a type array"); 64.162 typeArrayOop t = typeArrayOop(obj); 64.163 // Performance tweak: We skip iterating over the klass pointer since we 64.164 - // know that Universe::typeArrayKlass never moves. 64.165 + // know that Universe::TypeArrayKlass never moves. 64.166 return t->object_size(); 64.167 } 64.168 64.169 -int typeArrayKlass::oop_oop_iterate(oop obj, ExtendedOopClosure* blk) { 64.170 +int TypeArrayKlass::oop_oop_iterate(oop obj, ExtendedOopClosure* blk) { 64.171 assert(obj->is_typeArray(),"must be a type array"); 64.172 typeArrayOop t = typeArrayOop(obj); 64.173 // Performance tweak: We skip iterating over the klass pointer since we 64.174 - // know that Universe::typeArrayKlass never moves. 64.175 + // know that Universe::TypeArrayKlass never moves. 64.176 return t->object_size(); 64.177 } 64.178 64.179 -int typeArrayKlass::oop_oop_iterate_m(oop obj, ExtendedOopClosure* blk, MemRegion mr) { 64.180 +int TypeArrayKlass::oop_oop_iterate_m(oop obj, ExtendedOopClosure* blk, MemRegion mr) { 64.181 assert(obj->is_typeArray(),"must be a type array"); 64.182 typeArrayOop t = typeArrayOop(obj); 64.183 // Performance tweak: We skip iterating over the klass pointer since we 64.184 - // know that Universe::typeArrayKlass never moves. 64.185 + // know that Universe::TypeArrayKlass never moves. 64.186 return t->object_size(); 64.187 } 64.188 64.189 #ifndef SERIALGC 64.190 -void typeArrayKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { 64.191 +void TypeArrayKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { 64.192 ShouldNotReachHere(); 64.193 assert(obj->is_typeArray(),"must be a type array"); 64.194 } 64.195 64.196 int 64.197 -typeArrayKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { 64.198 +TypeArrayKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { 64.199 assert(obj->is_typeArray(),"must be a type array"); 64.200 return typeArrayOop(obj)->object_size(); 64.201 } 64.202 #endif // SERIALGC 64.203 64.204 -void typeArrayKlass::initialize(TRAPS) { 64.205 +void TypeArrayKlass::initialize(TRAPS) { 64.206 // Nothing to do. Having this function is handy since objArrayKlasses can be 64.207 - // initialized by calling initialize on their bottom_klass, see objArrayKlass::initialize 64.208 + // initialized by calling initialize on their bottom_klass, see ObjArrayKlass::initialize 64.209 } 64.210 64.211 -const char* typeArrayKlass::external_name(BasicType type) { 64.212 +const char* TypeArrayKlass::external_name(BasicType type) { 64.213 switch (type) { 64.214 case T_BOOLEAN: return "[Z"; 64.215 case T_CHAR: return "[C"; 64.216 @@ -276,7 +276,7 @@ 64.217 64.218 // Printing 64.219 64.220 -void typeArrayKlass::print_on(outputStream* st) const { 64.221 +void TypeArrayKlass::print_on(outputStream* st) const { 64.222 #ifndef PRODUCT 64.223 assert(is_klass(), "must be klass"); 64.224 print_value_on(st); 64.225 @@ -284,7 +284,7 @@ 64.226 #endif //PRODUCT 64.227 } 64.228 64.229 -void typeArrayKlass::print_value_on(outputStream* st) const { 64.230 +void TypeArrayKlass::print_value_on(outputStream* st) const { 64.231 assert(is_klass(), "must be klass"); 64.232 st->print("{type array "); 64.233 switch (element_type()) { 64.234 @@ -364,8 +364,8 @@ 64.235 } 64.236 64.237 64.238 -void typeArrayKlass::oop_print_on(oop obj, outputStream* st) { 64.239 - arrayKlass::oop_print_on(obj, st); 64.240 +void TypeArrayKlass::oop_print_on(oop obj, outputStream* st) { 64.241 + ArrayKlass::oop_print_on(obj, st); 64.242 typeArrayOop ta = typeArrayOop(obj); 64.243 int print_len = MIN2((intx) ta->length(), MaxElementPrintSize); 64.244 switch (element_type()) { 64.245 @@ -387,6 +387,6 @@ 64.246 64.247 #endif // PRODUCT 64.248 64.249 -const char* typeArrayKlass::internal_name() const { 64.250 +const char* TypeArrayKlass::internal_name() const { 64.251 return Klass::external_name(); 64.252 }
65.1 --- a/src/share/vm/oops/typeArrayKlass.hpp Fri Oct 05 13:37:08 2012 -0700 65.2 +++ b/src/share/vm/oops/typeArrayKlass.hpp Tue Oct 09 07:41:27 2012 +0200 65.3 @@ -28,19 +28,19 @@ 65.4 #include "classfile/classLoaderData.hpp" 65.5 #include "oops/arrayKlass.hpp" 65.6 65.7 -// A typeArrayKlass is the klass of a typeArray 65.8 +// A TypeArrayKlass is the klass of a typeArray 65.9 // It contains the type and size of the elements 65.10 65.11 -class typeArrayKlass : public arrayKlass { 65.12 +class TypeArrayKlass : public ArrayKlass { 65.13 friend class VMStructs; 65.14 private: 65.15 jint _max_length; // maximum number of elements allowed in an array 65.16 65.17 // Constructor 65.18 - typeArrayKlass(BasicType type, Symbol* name); 65.19 - static typeArrayKlass* allocate(ClassLoaderData* loader_data, BasicType type, Symbol* name, TRAPS); 65.20 + TypeArrayKlass(BasicType type, Symbol* name); 65.21 + static TypeArrayKlass* allocate(ClassLoaderData* loader_data, BasicType type, Symbol* name, TRAPS); 65.22 public: 65.23 - typeArrayKlass() {} // For dummy objects. 65.24 + TypeArrayKlass() {} // For dummy objects. 65.25 65.26 // instance variables 65.27 jint max_length() { return _max_length; } 65.28 @@ -50,10 +50,10 @@ 65.29 bool oop_is_typeArray_slow() const { return true; } 65.30 65.31 // klass allocation 65.32 - static typeArrayKlass* create_klass(BasicType type, const char* name_str, 65.33 + static TypeArrayKlass* create_klass(BasicType type, const char* name_str, 65.34 TRAPS); 65.35 static inline Klass* create_klass(BasicType type, int scale, TRAPS) { 65.36 - typeArrayKlass* tak = create_klass(type, external_name(type), CHECK_NULL); 65.37 + TypeArrayKlass* tak = create_klass(type, external_name(type), CHECK_NULL); 65.38 assert(scale == (1 << tak->log2_element_size()), "scale must check out"); 65.39 return tak; 65.40 } 65.41 @@ -90,17 +90,17 @@ 65.42 65.43 public: 65.44 // Casting from Klass* 65.45 - static typeArrayKlass* cast(Klass* k) { 65.46 - assert(k->oop_is_typeArray(), "cast to typeArrayKlass"); 65.47 - return (typeArrayKlass*) k; 65.48 + static TypeArrayKlass* cast(Klass* k) { 65.49 + assert(k->oop_is_typeArray(), "cast to TypeArrayKlass"); 65.50 + return (TypeArrayKlass*) k; 65.51 } 65.52 65.53 // Naming 65.54 static const char* external_name(BasicType type); 65.55 65.56 // Sizing 65.57 - static int header_size() { return sizeof(typeArrayKlass)/HeapWordSize; } 65.58 - int size() const { return arrayKlass::static_size(header_size()); } 65.59 + static int header_size() { return sizeof(TypeArrayKlass)/HeapWordSize; } 65.60 + int size() const { return ArrayKlass::static_size(header_size()); } 65.61 65.62 // Initialization (virtual from Klass) 65.63 void initialize(TRAPS);
66.1 --- a/src/share/vm/oops/typeArrayOop.hpp Fri Oct 05 13:37:08 2012 -0700 66.2 +++ b/src/share/vm/oops/typeArrayOop.hpp Tue Oct 09 07:41:27 2012 +0200 66.3 @@ -73,7 +73,7 @@ 66.4 jfloat* float_base() const { return (jfloat*) base(T_FLOAT); } 66.5 jdouble* double_base() const { return (jdouble*) base(T_DOUBLE); } 66.6 66.7 - friend class typeArrayKlass; 66.8 + friend class TypeArrayKlass; 66.9 66.10 public: 66.11 jbyte* byte_at_addr(int which) const { 66.12 @@ -190,7 +190,7 @@ 66.13 66.14 public: 66.15 int object_size() { 66.16 - typeArrayKlass* tk = typeArrayKlass::cast(klass()); 66.17 + TypeArrayKlass* tk = TypeArrayKlass::cast(klass()); 66.18 return object_size(tk->layout_helper(), length()); 66.19 } 66.20 };
67.1 --- a/src/share/vm/opto/library_call.cpp Fri Oct 05 13:37:08 2012 -0700 67.2 +++ b/src/share/vm/opto/library_call.cpp Tue Oct 09 07:41:27 2012 +0200 67.3 @@ -3435,7 +3435,7 @@ 67.4 if (generate_array_guard(kls, region) != NULL) { 67.5 // Be sure to pin the oop load to the guard edge just created: 67.6 Node* is_array_ctrl = region->in(region->req()-1); 67.7 - Node* cma = basic_plus_adr(kls, in_bytes(arrayKlass::component_mirror_offset())); 67.8 + Node* cma = basic_plus_adr(kls, in_bytes(ArrayKlass::component_mirror_offset())); 67.9 Node* cmo = make_load(is_array_ctrl, cma, TypeInstPtr::MIRROR, T_OBJECT); 67.10 phi->add_req(cmo); 67.11 } 67.12 @@ -5032,7 +5032,7 @@ 67.13 PreserveJVMState pjvms(this); 67.14 set_control(not_subtype_ctrl); 67.15 // (At this point we can assume disjoint_bases, since types differ.) 67.16 - int ek_offset = in_bytes(objArrayKlass::element_klass_offset()); 67.17 + int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset()); 67.18 Node* p1 = basic_plus_adr(dest_klass, ek_offset); 67.19 Node* n1 = LoadKlassNode::make(_gvn, immutable_memory(), p1, TypeRawPtr::BOTTOM); 67.20 Node* dest_elem_klass = _gvn.transform(n1);
68.1 --- a/src/share/vm/opto/memnode.cpp Fri Oct 05 13:37:08 2012 -0700 68.2 +++ b/src/share/vm/opto/memnode.cpp Tue Oct 09 07:41:27 2012 +0200 68.3 @@ -1671,9 +1671,9 @@ 68.4 } 68.5 const Type* aift = load_array_final_field(tkls, klass); 68.6 if (aift != NULL) return aift; 68.7 - if (tkls->offset() == in_bytes(arrayKlass::component_mirror_offset()) 68.8 + if (tkls->offset() == in_bytes(ArrayKlass::component_mirror_offset()) 68.9 && klass->is_array_klass()) { 68.10 - // The field is arrayKlass::_component_mirror. Return its (constant) value. 68.11 + // The field is ArrayKlass::_component_mirror. Return its (constant) value. 68.12 // (Folds up aClassConstant.getComponentType, common in Arrays.copyOf.) 68.13 assert(Opcode() == Op_LoadP, "must load an oop from _component_mirror"); 68.14 return TypeInstPtr::make(klass->as_array_klass()->component_mirror()); 68.15 @@ -2014,7 +2014,7 @@ 68.16 if( !klass->is_loaded() ) 68.17 return _type; // Bail out if not loaded 68.18 if( klass->is_obj_array_klass() && 68.19 - tkls->offset() == in_bytes(objArrayKlass::element_klass_offset())) { 68.20 + tkls->offset() == in_bytes(ObjArrayKlass::element_klass_offset())) { 68.21 ciKlass* elem = klass->as_obj_array_klass()->element_klass(); 68.22 // // Always returning precise element type is incorrect, 68.23 // // e.g., element type could be object and array may contain strings 68.24 @@ -2067,7 +2067,7 @@ 68.25 } 68.26 68.27 // Simplify k.java_mirror.as_klass to plain k, where k is a Klass*. 68.28 - // Simplify ak.component_mirror.array_klass to plain ak, ak an arrayKlass. 68.29 + // Simplify ak.component_mirror.array_klass to plain ak, ak an ArrayKlass. 68.30 // See inline_native_Class_query for occurrences of these patterns. 68.31 // Java Example: x.getClass().isAssignableFrom(y) 68.32 // Java Example: Array.newInstance(x.getClass().getComponentType(), n) 68.33 @@ -2080,7 +2080,7 @@ 68.34 && (offset == java_lang_Class::klass_offset_in_bytes() || 68.35 offset == java_lang_Class::array_klass_offset_in_bytes())) { 68.36 // We are loading a special hidden field from a Class mirror, 68.37 - // the field which points to its Klass or arrayKlass metaobject. 68.38 + // the field which points to its Klass or ArrayKlass metaobject. 68.39 if (base->is_Load()) { 68.40 Node* adr2 = base->in(MemNode::Address); 68.41 const TypeKlassPtr* tkls = phase->type(adr2)->isa_klassptr(); 68.42 @@ -2091,7 +2091,7 @@ 68.43 ) { 68.44 int mirror_field = in_bytes(Klass::java_mirror_offset()); 68.45 if (offset == java_lang_Class::array_klass_offset_in_bytes()) { 68.46 - mirror_field = in_bytes(arrayKlass::component_mirror_offset()); 68.47 + mirror_field = in_bytes(ArrayKlass::component_mirror_offset()); 68.48 } 68.49 if (tkls->offset() == mirror_field) { 68.50 return adr2->in(AddPNode::Base);
69.1 --- a/src/share/vm/opto/parseHelper.cpp Fri Oct 05 13:37:08 2012 -0700 69.2 +++ b/src/share/vm/opto/parseHelper.cpp Tue Oct 09 07:41:27 2012 +0200 69.3 @@ -200,7 +200,7 @@ 69.4 // Come here for polymorphic array klasses 69.5 69.6 // Extract the array element class 69.7 - int element_klass_offset = in_bytes(objArrayKlass::element_klass_offset()); 69.8 + int element_klass_offset = in_bytes(ObjArrayKlass::element_klass_offset()); 69.9 Node *p2 = basic_plus_adr(array_klass, array_klass, element_klass_offset); 69.10 Node *a_e_klass = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p2, tak) ); 69.11
70.1 --- a/src/share/vm/opto/runtime.cpp Fri Oct 05 13:37:08 2012 -0700 70.2 +++ b/src/share/vm/opto/runtime.cpp Tue Oct 09 07:41:27 2012 +0200 70.3 @@ -286,13 +286,13 @@ 70.4 if (Klass::cast(array_type)->oop_is_typeArray()) { 70.5 // The oopFactory likes to work with the element type. 70.6 // (We could bypass the oopFactory, since it doesn't add much value.) 70.7 - BasicType elem_type = typeArrayKlass::cast(array_type)->element_type(); 70.8 + BasicType elem_type = TypeArrayKlass::cast(array_type)->element_type(); 70.9 result = oopFactory::new_typeArray(elem_type, len, THREAD); 70.10 } else { 70.11 // Although the oopFactory likes to work with the elem_type, 70.12 // the compiler prefers the array_type, since it must already have 70.13 // that latter value in hand for the fast path. 70.14 - Klass* elem_type = objArrayKlass::cast(array_type)->element_klass(); 70.15 + Klass* elem_type = ObjArrayKlass::cast(array_type)->element_klass(); 70.16 result = oopFactory::new_objArray(elem_type, len, THREAD); 70.17 } 70.18 70.19 @@ -323,7 +323,7 @@ 70.20 70.21 assert(Klass::cast(array_type)->oop_is_typeArray(), "should be called only for type array"); 70.22 // The oopFactory likes to work with the element type. 70.23 - BasicType elem_type = typeArrayKlass::cast(array_type)->element_type(); 70.24 + BasicType elem_type = TypeArrayKlass::cast(array_type)->element_type(); 70.25 result = oopFactory::new_typeArray_nozero(elem_type, len, THREAD); 70.26 70.27 // Pass oops back through thread local storage. Our apparent type to Java 70.28 @@ -344,7 +344,7 @@ 70.29 is_deoptimized_caller_frame(thread)) { 70.30 // Zero array here if the caller is deoptimized. 70.31 int size = ((typeArrayOop)result)->object_size(); 70.32 - BasicType elem_type = typeArrayKlass::cast(array_type)->element_type(); 70.33 + BasicType elem_type = TypeArrayKlass::cast(array_type)->element_type(); 70.34 const size_t hs = arrayOopDesc::header_size(elem_type); 70.35 // Align to next 8 bytes to avoid trashing arrays's length. 70.36 const size_t aligned_hs = align_object_offset(hs); 70.37 @@ -370,7 +370,7 @@ 70.38 jint dims[2]; 70.39 dims[0] = len1; 70.40 dims[1] = len2; 70.41 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(2, dims, THREAD); 70.42 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(2, dims, THREAD); 70.43 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION); 70.44 thread->set_vm_result(obj); 70.45 JRT_END 70.46 @@ -386,7 +386,7 @@ 70.47 dims[0] = len1; 70.48 dims[1] = len2; 70.49 dims[2] = len3; 70.50 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(3, dims, THREAD); 70.51 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(3, dims, THREAD); 70.52 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION); 70.53 thread->set_vm_result(obj); 70.54 JRT_END 70.55 @@ -403,7 +403,7 @@ 70.56 dims[1] = len2; 70.57 dims[2] = len3; 70.58 dims[3] = len4; 70.59 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(4, dims, THREAD); 70.60 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(4, dims, THREAD); 70.61 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION); 70.62 thread->set_vm_result(obj); 70.63 JRT_END 70.64 @@ -421,7 +421,7 @@ 70.65 dims[2] = len3; 70.66 dims[3] = len4; 70.67 dims[4] = len5; 70.68 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(5, dims, THREAD); 70.69 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(5, dims, THREAD); 70.70 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION); 70.71 thread->set_vm_result(obj); 70.72 JRT_END 70.73 @@ -438,7 +438,7 @@ 70.74 jint *c_dims = NEW_RESOURCE_ARRAY(jint, len); 70.75 Copy::conjoint_jints_atomic(j_dims, c_dims, len); 70.76 70.77 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(len, c_dims, THREAD); 70.78 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(len, c_dims, THREAD); 70.79 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION); 70.80 thread->set_vm_result(obj); 70.81 JRT_END
71.1 --- a/src/share/vm/prims/jni.cpp Fri Oct 05 13:37:08 2012 -0700 71.2 +++ b/src/share/vm/prims/jni.cpp Tue Oct 09 07:41:27 2012 +0200 71.3 @@ -1,5 +1,6 @@ 71.4 /* 71.5 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 71.6 + * Copyright (c) 2012 Red Hat, Inc. 71.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 71.8 * 71.9 * This code is free software; you can redistribute it and/or modify it 71.10 @@ -2820,10 +2821,9 @@ 71.11 JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \ 71.12 JNIWrapper("Set" XSTR(Result) "Field"); \ 71.13 \ 71.14 - HS_DTRACE_PROBE_CDECL_N(hotspot_jni, Set##Result##Field__entry, \ 71.15 - ( JNIEnv*, jobject, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \ 71.16 - HS_DTRACE_PROBE_N(hotspot_jni, Set##Result##Field__entry, \ 71.17 - ( env, obj, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \ 71.18 + FP_SELECT_##Result( \ 71.19 + DTRACE_PROBE4(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID, value), \ 71.20 + DTRACE_PROBE3(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID)); \ 71.21 \ 71.22 oop o = JNIHandles::resolve_non_null(obj); \ 71.23 Klass* k = o->klass(); \ 71.24 @@ -3130,10 +3130,9 @@ 71.25 \ 71.26 JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \ 71.27 JNIWrapper("SetStatic" XSTR(Result) "Field"); \ 71.28 - HS_DTRACE_PROBE_CDECL_N(hotspot_jni, SetStatic##Result##Field__entry,\ 71.29 - ( JNIEnv*, jclass, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \ 71.30 - HS_DTRACE_PROBE_N(hotspot_jni, SetStatic##Result##Field__entry, \ 71.31 - ( env, clazz, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \ 71.32 + FP_SELECT_##Result( \ 71.33 + DTRACE_PROBE4(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID, value), \ 71.34 + DTRACE_PROBE3(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID)); \ 71.35 \ 71.36 JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \ 71.37 assert(id->is_static_field_id(), "invalid static field id"); \ 71.38 @@ -3442,8 +3441,8 @@ 71.39 KlassHandle ek(THREAD, java_lang_Class::as_Klass(JNIHandles::resolve_non_null(elementClass))); 71.40 Klass* ako = Klass::cast(ek())->array_klass(CHECK_NULL); 71.41 KlassHandle ak = KlassHandle(THREAD, ako); 71.42 - objArrayKlass::cast(ak())->initialize(CHECK_NULL); 71.43 - objArrayOop result = objArrayKlass::cast(ak())->allocate(length, CHECK_NULL); 71.44 + ObjArrayKlass::cast(ak())->initialize(CHECK_NULL); 71.45 + objArrayOop result = ObjArrayKlass::cast(ak())->allocate(length, CHECK_NULL); 71.46 oop initial_value = JNIHandles::resolve(initialElement); 71.47 if (initial_value != NULL) { // array already initialized with NULL 71.48 for (int index = 0; index < length; index++) { 71.49 @@ -3502,7 +3501,7 @@ 71.50 objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(array)); 71.51 oop v = JNIHandles::resolve(value); 71.52 if (a->is_within_bounds(index)) { 71.53 - if (v == NULL || v->is_a(objArrayKlass::cast(a->klass())->element_klass())) { 71.54 + if (v == NULL || v->is_a(ObjArrayKlass::cast(a->klass())->element_klass())) { 71.55 a->obj_at_put(index, v); 71.56 } else { 71.57 THROW(vmSymbols::java_lang_ArrayStoreException()); 71.58 @@ -3787,7 +3786,7 @@ 71.59 THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \ 71.60 } else { \ 71.61 if (len > 0) { \ 71.62 - int sc = typeArrayKlass::cast(src->klass())->log2_element_size(); \ 71.63 + int sc = TypeArrayKlass::cast(src->klass())->log2_element_size(); \ 71.64 memcpy((u_char*) buf, \ 71.65 (u_char*) src->Tag##_at_addr(start), \ 71.66 len << sc); \ 71.67 @@ -3822,7 +3821,7 @@ 71.68 THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \ 71.69 } else { \ 71.70 if (len > 0) { \ 71.71 - int sc = typeArrayKlass::cast(src->klass())->log2_element_size(); \ 71.72 + int sc = TypeArrayKlass::cast(src->klass())->log2_element_size(); \ 71.73 memcpy((u_char*) buf, \ 71.74 (u_char*) src->Tag##_at_addr(start), \ 71.75 len << sc); \ 71.76 @@ -3871,7 +3870,7 @@ 71.77 THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \ 71.78 } else { \ 71.79 if (len > 0) { \ 71.80 - int sc = typeArrayKlass::cast(dst->klass())->log2_element_size(); \ 71.81 + int sc = TypeArrayKlass::cast(dst->klass())->log2_element_size(); \ 71.82 memcpy((u_char*) dst->Tag##_at_addr(start), \ 71.83 (u_char*) buf, \ 71.84 len << sc); \ 71.85 @@ -3906,7 +3905,7 @@ 71.86 THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \ 71.87 } else { \ 71.88 if (len > 0) { \ 71.89 - int sc = typeArrayKlass::cast(dst->klass())->log2_element_size(); \ 71.90 + int sc = TypeArrayKlass::cast(dst->klass())->log2_element_size(); \ 71.91 memcpy((u_char*) dst->Tag##_at_addr(start), \ 71.92 (u_char*) buf, \ 71.93 len << sc); \ 71.94 @@ -4251,7 +4250,7 @@ 71.95 if (a->is_objArray()) { 71.96 type = T_OBJECT; 71.97 } else { 71.98 - type = typeArrayKlass::cast(a->klass())->element_type(); 71.99 + type = TypeArrayKlass::cast(a->klass())->element_type(); 71.100 } 71.101 void* ret = arrayOop(a)->base(type); 71.102 #ifndef USDT2
72.1 --- a/src/share/vm/prims/jniCheck.cpp Fri Oct 05 13:37:08 2012 -0700 72.2 +++ b/src/share/vm/prims/jniCheck.cpp Tue Oct 09 07:41:27 2012 +0200 72.3 @@ -290,7 +290,7 @@ 72.4 72.5 if (elementType != -1) { 72.6 if (aOop->is_typeArray()) { 72.7 - BasicType array_type = typeArrayKlass::cast(aOop->klass())->element_type(); 72.8 + BasicType array_type = TypeArrayKlass::cast(aOop->klass())->element_type(); 72.9 if (array_type != elementType) 72.10 ReportJNIFatalError(thr, fatal_element_type_mismatch); 72.11 } else if (aOop->is_objArray()) {
73.1 --- a/src/share/vm/prims/jvm.cpp Fri Oct 05 13:37:08 2012 -0700 73.2 +++ b/src/share/vm/prims/jvm.cpp Tue Oct 09 07:41:27 2012 +0200 73.3 @@ -1048,7 +1048,7 @@ 73.4 if (signers == NULL) return NULL; 73.5 73.6 // copy of the signers array 73.7 - Klass* element = objArrayKlass::cast(signers->klass())->element_klass(); 73.8 + Klass* element = ObjArrayKlass::cast(signers->klass())->element_klass(); 73.9 objArrayOop signers_copy = oopFactory::new_objArray(element, signers->length(), CHECK_NULL); 73.10 for (int index = 0; index < signers->length(); index++) { 73.11 signers_copy->obj_at_put(index, signers->obj_at(index)); 73.12 @@ -3302,10 +3302,10 @@ 73.13 73.14 if (k->oop_is_typeArray()) { 73.15 // typeArray 73.16 - result = typeArrayKlass::cast(k)->allocate(length, CHECK_NULL); 73.17 + result = TypeArrayKlass::cast(k)->allocate(length, CHECK_NULL); 73.18 } else if (k->oop_is_objArray()) { 73.19 // objArray 73.20 - objArrayKlass* oak = objArrayKlass::cast(k); 73.21 + ObjArrayKlass* oak = ObjArrayKlass::cast(k); 73.22 oak->initialize(CHECK_NULL); // make sure class is initialized (matches Classic VM behavior) 73.23 result = oak->allocate(length, CHECK_NULL); 73.24 } else { 73.25 @@ -4193,7 +4193,7 @@ 73.26 } 73.27 73.28 // check if threads is not an array of objects of Thread class 73.29 - Klass* k = objArrayKlass::cast(ah->klass())->element_klass(); 73.30 + Klass* k = ObjArrayKlass::cast(ah->klass())->element_klass(); 73.31 if (k != SystemDictionary::Thread_klass()) { 73.32 THROW_(vmSymbols::java_lang_IllegalArgumentException(), 0); 73.33 }
74.1 --- a/src/share/vm/prims/jvmtiRedefineClasses.cpp Fri Oct 05 13:37:08 2012 -0700 74.2 +++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp Tue Oct 09 07:41:27 2012 +0200 74.3 @@ -2606,7 +2606,7 @@ 74.4 74.5 74.6 void VM_RedefineClasses::adjust_array_vtable(Klass* k_oop) { 74.7 - arrayKlass* ak = arrayKlass::cast(k_oop); 74.8 + ArrayKlass* ak = ArrayKlass::cast(k_oop); 74.9 bool trace_name_printed = false; 74.10 ak->vtable()->adjust_method_entries(_matching_old_methods, 74.11 _matching_new_methods,
75.1 --- a/src/share/vm/prims/jvmtiTagMap.cpp Fri Oct 05 13:37:08 2012 -0700 75.2 +++ b/src/share/vm/prims/jvmtiTagMap.cpp Tue Oct 09 07:41:27 2012 +0200 75.3 @@ -1075,7 +1075,7 @@ 75.4 75.5 // get base address of first element 75.6 typeArrayOop array = typeArrayOop(obj); 75.7 - BasicType type = typeArrayKlass::cast(array->klass())->element_type(); 75.8 + BasicType type = TypeArrayKlass::cast(array->klass())->element_type(); 75.9 void* elements = array->base(type); 75.10 75.11 // jvmtiPrimitiveType is defined so this mapping is always correct 75.12 @@ -2750,7 +2750,7 @@ 75.13 objArrayOop array = objArrayOop(o); 75.14 75.15 // array reference to its class 75.16 - oop mirror = objArrayKlass::cast(array->klass())->java_mirror(); 75.17 + oop mirror = ObjArrayKlass::cast(array->klass())->java_mirror(); 75.18 if (!CallbackInvoker::report_class_reference(o, mirror)) { 75.19 return false; 75.20 }
76.1 --- a/src/share/vm/prims/unsafe.cpp Fri Oct 05 13:37:08 2012 -0700 76.2 +++ b/src/share/vm/prims/unsafe.cpp Tue Oct 09 07:41:27 2012 +0200 76.3 @@ -802,7 +802,7 @@ 76.4 base = arrayOopDesc::base_offset_in_bytes(T_OBJECT); 76.5 scale = heapOopSize; 76.6 } else if (k->oop_is_typeArray()) { 76.7 - typeArrayKlass* tak = typeArrayKlass::cast(k); 76.8 + TypeArrayKlass* tak = TypeArrayKlass::cast(k); 76.9 base = tak->array_header_in_bytes(); 76.10 assert(base == arrayOopDesc::base_offset_in_bytes(tak->element_type()), "array_header_size semantics ok"); 76.11 scale = (1 << tak->log2_element_size());
77.1 --- a/src/share/vm/runtime/advancedThresholdPolicy.cpp Fri Oct 05 13:37:08 2012 -0700 77.2 +++ b/src/share/vm/runtime/advancedThresholdPolicy.cpp Tue Oct 09 07:41:27 2012 +0200 77.3 @@ -156,7 +156,7 @@ 77.4 // Called with the queue locked and with at least one element 77.5 CompileTask* AdvancedThresholdPolicy::select_task(CompileQueue* compile_queue) { 77.6 CompileTask *max_task = NULL; 77.7 - Method* max_method; 77.8 + Method* max_method = NULL; 77.9 jlong t = os::javaTimeMillis(); 77.10 // Iterate through the queue and find a method with a maximum rate. 77.11 for (CompileTask* task = compile_queue->first(); task != NULL;) {
78.1 --- a/src/share/vm/runtime/deoptimization.cpp Fri Oct 05 13:37:08 2012 -0700 78.2 +++ b/src/share/vm/runtime/deoptimization.cpp Tue Oct 09 07:41:27 2012 +0200 78.3 @@ -755,12 +755,12 @@ 78.4 InstanceKlass* ik = InstanceKlass::cast(k()); 78.5 obj = ik->allocate_instance(CHECK_(false)); 78.6 } else if (k->oop_is_typeArray()) { 78.7 - typeArrayKlass* ak = typeArrayKlass::cast(k()); 78.8 + TypeArrayKlass* ak = TypeArrayKlass::cast(k()); 78.9 assert(sv->field_size() % type2size[ak->element_type()] == 0, "non-integral array length"); 78.10 int len = sv->field_size() / type2size[ak->element_type()]; 78.11 obj = ak->allocate(len, CHECK_(false)); 78.12 } else if (k->oop_is_objArray()) { 78.13 - objArrayKlass* ak = objArrayKlass::cast(k()); 78.14 + ObjArrayKlass* ak = ObjArrayKlass::cast(k()); 78.15 obj = ak->allocate(sv->field_size(), CHECK_(false)); 78.16 } 78.17 78.18 @@ -923,7 +923,7 @@ 78.19 FieldReassigner reassign(fr, reg_map, sv, obj()); 78.20 ik->do_nonstatic_fields(&reassign); 78.21 } else if (k->oop_is_typeArray()) { 78.22 - typeArrayKlass* ak = typeArrayKlass::cast(k()); 78.23 + TypeArrayKlass* ak = TypeArrayKlass::cast(k()); 78.24 reassign_type_array_elements(fr, reg_map, sv, (typeArrayOop) obj(), ak->element_type()); 78.25 } else if (k->oop_is_objArray()) { 78.26 reassign_object_array_elements(fr, reg_map, sv, (objArrayOop) obj());
79.1 --- a/src/share/vm/runtime/globals.hpp Fri Oct 05 13:37:08 2012 -0700 79.2 +++ b/src/share/vm/runtime/globals.hpp Tue Oct 09 07:41:27 2012 +0200 79.3 @@ -1066,9 +1066,6 @@ 79.4 \ 79.5 product(bool, MonitorInUseLists, false, "Track Monitors for Deflation") \ 79.6 \ 79.7 - product(intx, Atomics, 0, \ 79.8 - "(Unsafe,Unstable) Diagnostic - Controls emission of atomics") \ 79.9 - \ 79.10 product(intx, SyncFlags, 0, "(Unsafe,Unstable) Experimental Sync flags" ) \ 79.11 \ 79.12 product(intx, SyncVerbose, 0, "(Unstable)" ) \
80.1 --- a/src/share/vm/runtime/reflection.cpp Fri Oct 05 13:37:08 2012 -0700 80.2 +++ b/src/share/vm/runtime/reflection.cpp Tue Oct 09 07:41:27 2012 +0200 80.3 @@ -212,7 +212,7 @@ 80.4 return T_OBJECT; 80.5 } else { 80.6 assert(a->is_typeArray(), "just checking"); 80.7 - BasicType type = typeArrayKlass::cast(a->klass())->element_type(); 80.8 + BasicType type = TypeArrayKlass::cast(a->klass())->element_type(); 80.9 switch (type) { 80.10 case T_BOOLEAN: 80.11 value->z = typeArrayOop(a)->bool_at(index); 80.12 @@ -254,7 +254,7 @@ 80.13 if (value_type == T_OBJECT) { 80.14 oop obj = (oop) value->l; 80.15 if (obj != NULL) { 80.16 - Klass* element_klass = objArrayKlass::cast(a->klass())->element_klass(); 80.17 + Klass* element_klass = ObjArrayKlass::cast(a->klass())->element_klass(); 80.18 if (!obj->is_a(element_klass)) { 80.19 THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "array element type mismatch"); 80.20 } 80.21 @@ -263,7 +263,7 @@ 80.22 } 80.23 } else { 80.24 assert(a->is_typeArray(), "just checking"); 80.25 - BasicType array_type = typeArrayKlass::cast(a->klass())->element_type(); 80.26 + BasicType array_type = TypeArrayKlass::cast(a->klass())->element_type(); 80.27 if (array_type != value_type) { 80.28 // The widen operation can potentially throw an exception, but cannot block, 80.29 // so typeArrayOop a is safe if the call succeeds. 80.30 @@ -313,7 +313,7 @@ 80.31 80.32 80.33 oop Reflection:: basic_type_arrayklass_to_mirror(Klass* basic_type_arrayklass, TRAPS) { 80.34 - BasicType type = typeArrayKlass::cast(basic_type_arrayklass)->element_type(); 80.35 + BasicType type = TypeArrayKlass::cast(basic_type_arrayklass)->element_type(); 80.36 return Universe::java_mirror(type); 80.37 } 80.38 80.39 @@ -327,10 +327,10 @@ 80.40 } 80.41 if (java_lang_Class::is_primitive(element_mirror)) { 80.42 Klass* tak = basic_type_mirror_to_arrayklass(element_mirror, CHECK_NULL); 80.43 - return typeArrayKlass::cast(tak)->allocate(length, THREAD); 80.44 + return TypeArrayKlass::cast(tak)->allocate(length, THREAD); 80.45 } else { 80.46 Klass* k = java_lang_Class::as_Klass(element_mirror); 80.47 - if (Klass::cast(k)->oop_is_array() && arrayKlass::cast(k)->dimension() >= MAX_DIM) { 80.48 + if (Klass::cast(k)->oop_is_array() && ArrayKlass::cast(k)->dimension() >= MAX_DIM) { 80.49 THROW_0(vmSymbols::java_lang_IllegalArgumentException()); 80.50 } 80.51 return oopFactory::new_objArray(k, length, THREAD); 80.52 @@ -340,7 +340,7 @@ 80.53 80.54 arrayOop Reflection::reflect_new_multi_array(oop element_mirror, typeArrayOop dim_array, TRAPS) { 80.55 assert(dim_array->is_typeArray(), "just checking"); 80.56 - assert(typeArrayKlass::cast(dim_array->klass())->element_type() == T_INT, "just checking"); 80.57 + assert(TypeArrayKlass::cast(dim_array->klass())->element_type() == T_INT, "just checking"); 80.58 80.59 if (element_mirror == NULL) { 80.60 THROW_0(vmSymbols::java_lang_NullPointerException()); 80.61 @@ -367,7 +367,7 @@ 80.62 } else { 80.63 klass = java_lang_Class::as_Klass(element_mirror); 80.64 if (Klass::cast(klass)->oop_is_array()) { 80.65 - int k_dim = arrayKlass::cast(klass)->dimension(); 80.66 + int k_dim = ArrayKlass::cast(klass)->dimension(); 80.67 if (k_dim + len > MAX_DIM) { 80.68 THROW_0(vmSymbols::java_lang_IllegalArgumentException()); 80.69 } 80.70 @@ -375,7 +375,7 @@ 80.71 } 80.72 } 80.73 klass = Klass::cast(klass)->array_klass(dim, CHECK_NULL); 80.74 - oop obj = arrayKlass::cast(klass)->multi_allocate(len, dimensions, THREAD); 80.75 + oop obj = ArrayKlass::cast(klass)->multi_allocate(len, dimensions, THREAD); 80.76 assert(obj->is_array(), "just checking"); 80.77 return arrayOop(obj); 80.78 } 80.79 @@ -391,17 +391,17 @@ 80.80 return NULL; 80.81 } 80.82 80.83 - oop result = arrayKlass::cast(klass)->component_mirror(); 80.84 + oop result = ArrayKlass::cast(klass)->component_mirror(); 80.85 #ifdef ASSERT 80.86 oop result2 = NULL; 80.87 - if (arrayKlass::cast(klass)->dimension() == 1) { 80.88 + if (ArrayKlass::cast(klass)->dimension() == 1) { 80.89 if (Klass::cast(klass)->oop_is_typeArray()) { 80.90 result2 = basic_type_arrayklass_to_mirror(klass, CHECK_NULL); 80.91 } else { 80.92 - result2 = Klass::cast(objArrayKlass::cast(klass)->element_klass())->java_mirror(); 80.93 + result2 = Klass::cast(ObjArrayKlass::cast(klass)->element_klass())->java_mirror(); 80.94 } 80.95 } else { 80.96 - Klass* lower_dim = arrayKlass::cast(klass)->lower_dimension(); 80.97 + Klass* lower_dim = ArrayKlass::cast(klass)->lower_dimension(); 80.98 assert(Klass::cast(lower_dim)->oop_is_array(), "just checking"); 80.99 result2 = Klass::cast(lower_dim)->java_mirror(); 80.100 }
81.1 --- a/src/share/vm/runtime/sharedRuntime.cpp Fri Oct 05 13:37:08 2012 -0700 81.2 +++ b/src/share/vm/runtime/sharedRuntime.cpp Tue Oct 09 07:41:27 2012 +0200 81.3 @@ -2705,7 +2705,7 @@ 81.4 int jlsLen = java_lang_String::length(src); 81.5 jchar* jlsPos = (jlsLen == 0) ? NULL : 81.6 jlsValue->char_at_addr(jlsOffset); 81.7 - assert(typeArrayKlass::cast(jlsValue->klass())->element_type() == T_CHAR, "compressed string"); 81.8 + assert(TypeArrayKlass::cast(jlsValue->klass())->element_type() == T_CHAR, "compressed string"); 81.9 (void) UNICODE::as_utf8(jlsPos, jlsLen, (char *)dst, max_dtrace_string_size); 81.10 } 81.11 #endif // ndef HAVE_DTRACE_H
82.1 --- a/src/share/vm/runtime/vmStructs.cpp Fri Oct 05 13:37:08 2012 -0700 82.2 +++ b/src/share/vm/runtime/vmStructs.cpp Tue Oct 09 07:41:27 2012 +0200 82.3 @@ -268,12 +268,12 @@ 82.4 volatile_nonstatic_field(oopDesc, _metadata._klass, Klass*) \ 82.5 volatile_nonstatic_field(oopDesc, _metadata._compressed_klass, narrowOop) \ 82.6 static_field(oopDesc, _bs, BarrierSet*) \ 82.7 - nonstatic_field(arrayKlass, _dimension, int) \ 82.8 - volatile_nonstatic_field(arrayKlass, _higher_dimension, Klass*) \ 82.9 - volatile_nonstatic_field(arrayKlass, _lower_dimension, Klass*) \ 82.10 - nonstatic_field(arrayKlass, _vtable_len, int) \ 82.11 - nonstatic_field(arrayKlass, _alloc_size, juint) \ 82.12 - nonstatic_field(arrayKlass, _component_mirror, oop) \ 82.13 + nonstatic_field(ArrayKlass, _dimension, int) \ 82.14 + volatile_nonstatic_field(ArrayKlass, _higher_dimension, Klass*) \ 82.15 + volatile_nonstatic_field(ArrayKlass, _lower_dimension, Klass*) \ 82.16 + nonstatic_field(ArrayKlass, _vtable_len, int) \ 82.17 + nonstatic_field(ArrayKlass, _alloc_size, juint) \ 82.18 + nonstatic_field(ArrayKlass, _component_mirror, oop) \ 82.19 nonstatic_field(CompiledICHolder, _holder_method, Method*) \ 82.20 nonstatic_field(CompiledICHolder, _holder_klass, Klass*) \ 82.21 nonstatic_field(ConstantPool, _tags, Array<u1>*) \ 82.22 @@ -379,13 +379,13 @@ 82.23 nonstatic_field(ConstMethod, _signature_index, u2) \ 82.24 nonstatic_field(ConstMethod, _method_idnum, u2) \ 82.25 nonstatic_field(ConstMethod, _generic_signature_index, u2) \ 82.26 - nonstatic_field(objArrayKlass, _element_klass, Klass*) \ 82.27 - nonstatic_field(objArrayKlass, _bottom_klass, Klass*) \ 82.28 + nonstatic_field(ObjArrayKlass, _element_klass, Klass*) \ 82.29 + nonstatic_field(ObjArrayKlass, _bottom_klass, Klass*) \ 82.30 volatile_nonstatic_field(Symbol, _refcount, int) \ 82.31 nonstatic_field(Symbol, _identity_hash, int) \ 82.32 nonstatic_field(Symbol, _length, unsigned short) \ 82.33 unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \ 82.34 - nonstatic_field(typeArrayKlass, _max_length, int) \ 82.35 + nonstatic_field(TypeArrayKlass, _max_length, int) \ 82.36 \ 82.37 /***********************/ \ 82.38 /* Constant Pool Cache */ \ 82.39 @@ -1370,9 +1370,9 @@ 82.40 declare_toplevel_type(MetaspaceObj) \ 82.41 declare_type(Metadata, MetaspaceObj) \ 82.42 declare_type(Klass, Metadata) \ 82.43 - declare_type(arrayKlass, Klass) \ 82.44 - declare_type(objArrayKlass, arrayKlass) \ 82.45 - declare_type(typeArrayKlass, arrayKlass) \ 82.46 + declare_type(ArrayKlass, Klass) \ 82.47 + declare_type(ObjArrayKlass, ArrayKlass) \ 82.48 + declare_type(TypeArrayKlass, ArrayKlass) \ 82.49 declare_type(InstanceKlass, Klass) \ 82.50 declare_type(InstanceClassLoaderKlass, InstanceKlass) \ 82.51 declare_type(InstanceMirrorKlass, InstanceKlass) \
83.1 --- a/src/share/vm/services/attachListener.cpp Fri Oct 05 13:37:08 2012 -0700 83.2 +++ b/src/share/vm/services/attachListener.cpp Tue Oct 09 07:41:27 2012 +0200 83.3 @@ -88,7 +88,7 @@ 83.4 // The result should be a [B 83.5 oop res = (oop)result.get_jobject(); 83.6 assert(res->is_typeArray(), "just checking"); 83.7 - assert(typeArrayKlass::cast(res->klass())->element_type() == T_BYTE, "just checking"); 83.8 + assert(TypeArrayKlass::cast(res->klass())->element_type() == T_BYTE, "just checking"); 83.9 83.10 // copy the bytes to the output stream 83.11 typeArrayOop ba = typeArrayOop(res);
84.1 --- a/src/share/vm/services/diagnosticCommand.cpp Fri Oct 05 13:37:08 2012 -0700 84.2 +++ b/src/share/vm/services/diagnosticCommand.cpp Tue Oct 09 07:41:27 2012 +0200 84.3 @@ -204,7 +204,7 @@ 84.4 // The result should be a [B 84.5 oop res = (oop)result.get_jobject(); 84.6 assert(res->is_typeArray(), "just checking"); 84.7 - assert(typeArrayKlass::cast(res->klass())->element_type() == T_BYTE, "just checking"); 84.8 + assert(TypeArrayKlass::cast(res->klass())->element_type() == T_BYTE, "just checking"); 84.9 84.10 // copy the bytes to the output stream 84.11 typeArrayOop ba = typeArrayOop(res);
85.1 --- a/src/share/vm/services/heapDumper.cpp Fri Oct 05 13:37:08 2012 -0700 85.2 +++ b/src/share/vm/services/heapDumper.cpp Tue Oct 09 07:41:27 2012 +0200 85.3 @@ -933,7 +933,7 @@ 85.4 k = klass->array_klass_or_null(); 85.5 while (k != NULL) { 85.6 Klass* klass = Klass::cast(k); 85.7 - assert(klass->oop_is_objArray(), "not an objArrayKlass"); 85.8 + assert(klass->oop_is_objArray(), "not an ObjArrayKlass"); 85.9 85.10 writer->write_u1(HPROF_GC_CLASS_DUMP); 85.11 writer->write_classID(klass); 85.12 @@ -1016,7 +1016,7 @@ 85.13 85.14 // creates HPROF_GC_PRIM_ARRAY_DUMP record for the given type array 85.15 void DumperSupport::dump_prim_array(DumpWriter* writer, typeArrayOop array) { 85.16 - BasicType type = typeArrayKlass::cast(array->klass())->element_type(); 85.17 + BasicType type = TypeArrayKlass::cast(array->klass())->element_type(); 85.18 85.19 writer->write_u1(HPROF_GC_PRIM_ARRAY_DUMP); 85.20 writer->write_objectID(array);
86.1 --- a/src/share/vm/services/management.cpp Fri Oct 05 13:37:08 2012 -0700 86.2 +++ b/src/share/vm/services/management.cpp Tue Oct 09 07:41:27 2012 +0200 86.3 @@ -426,7 +426,7 @@ 86.4 static void validate_thread_info_array(objArrayHandle infoArray_h, TRAPS) { 86.5 // check if the element of infoArray is of type ThreadInfo class 86.6 Klass* threadinfo_klass = Management::java_lang_management_ThreadInfo_klass(CHECK); 86.7 - Klass* element_klass = objArrayKlass::cast(infoArray_h->klass())->element_klass(); 86.8 + Klass* element_klass = ObjArrayKlass::cast(infoArray_h->klass())->element_klass(); 86.9 if (element_klass != threadinfo_klass) { 86.10 THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), 86.11 "infoArray element type is not ThreadInfo class"); 86.12 @@ -1715,7 +1715,7 @@ 86.13 objArrayOop ta = objArrayOop(JNIHandles::resolve_non_null(names)); 86.14 objArrayHandle names_ah(THREAD, ta); 86.15 // Make sure we have a String array 86.16 - Klass* element_klass = objArrayKlass::cast(names_ah->klass())->element_klass(); 86.17 + Klass* element_klass = ObjArrayKlass::cast(names_ah->klass())->element_klass(); 86.18 if (element_klass != SystemDictionary::String_klass()) { 86.19 THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), 86.20 "Array element type is not String class", 0); 86.21 @@ -1891,7 +1891,7 @@ 86.22 objArrayHandle names_ah(THREAD, na); 86.23 86.24 // Make sure we have a String array 86.25 - Klass* element_klass = objArrayKlass::cast(names_ah->klass())->element_klass(); 86.26 + Klass* element_klass = ObjArrayKlass::cast(names_ah->klass())->element_klass(); 86.27 if (element_klass != SystemDictionary::String_klass()) { 86.28 THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), 86.29 "Array element type is not String class", 0); 86.30 @@ -2008,7 +2008,7 @@ 86.31 86.32 // check if the element of array is of type MemoryUsage class 86.33 Klass* usage_klass = Management::java_lang_management_MemoryUsage_klass(CHECK_0); 86.34 - Klass* element_klass = objArrayKlass::cast(array_h->klass())->element_klass(); 86.35 + Klass* element_klass = ObjArrayKlass::cast(array_h->klass())->element_klass(); 86.36 if (element_klass != usage_klass) { 86.37 THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), 86.38 "The element type is not MemoryUsage class", 0); 86.39 @@ -2156,7 +2156,7 @@ 86.40 objArrayHandle cmds_ah(THREAD, ca); 86.41 86.42 // Make sure we have a String array 86.43 - Klass* element_klass = objArrayKlass::cast(cmds_ah->klass())->element_klass(); 86.44 + Klass* element_klass = ObjArrayKlass::cast(cmds_ah->klass())->element_klass(); 86.45 if (element_klass != SystemDictionary::String_klass()) { 86.46 THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), 86.47 "Array element type is not String class");
87.1 --- a/src/share/vm/services/threadService.cpp Fri Oct 05 13:37:08 2012 -0700 87.2 +++ b/src/share/vm/services/threadService.cpp Tue Oct 09 07:41:27 2012 +0200 87.3 @@ -250,7 +250,7 @@ 87.4 87.5 ResourceMark rm(THREAD); 87.6 Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_StackTraceElement_array(), true, CHECK_NH); 87.7 - objArrayKlass* ik = objArrayKlass::cast(k); 87.8 + ObjArrayKlass* ik = ObjArrayKlass::cast(k); 87.9 objArrayOop r = oopFactory::new_objArray(ik, num_threads, CHECK_NH); 87.10 objArrayHandle result_obj(THREAD, r); 87.11
88.1 --- a/src/share/vm/shark/sharkRuntime.cpp Fri Oct 05 13:37:08 2012 -0700 88.2 +++ b/src/share/vm/shark/sharkRuntime.cpp Tue Oct 09 07:41:27 2012 +0200 88.3 @@ -129,7 +129,7 @@ 88.4 int ndims, 88.5 int* dims)) 88.6 Klass* klass = method(thread)->constants()->klass_at(index, CHECK); 88.7 - oop obj = arrayKlass::cast(klass)->multi_allocate(ndims, dims, CHECK); 88.8 + oop obj = ArrayKlass::cast(klass)->multi_allocate(ndims, dims, CHECK); 88.9 thread->set_vm_result(obj); 88.10 JRT_END 88.11
89.1 --- a/src/share/vm/utilities/dtrace.hpp Fri Oct 05 13:37:08 2012 -0700 89.2 +++ b/src/share/vm/utilities/dtrace.hpp Tue Oct 09 07:41:27 2012 +0200 89.3 @@ -1,5 +1,6 @@ 89.4 /* 89.5 - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 89.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. 89.7 + * Copyright (c) 2009, 2012 Red Hat, Inc. 89.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 89.9 * 89.10 * This code is free software; you can redistribute it and/or modify it 89.11 @@ -32,13 +33,17 @@ 89.12 #define DTRACE_ONLY(x) x 89.13 #define NOT_DTRACE(x) 89.14 89.15 +#if defined(SOLARIS) 89.16 // Work around dtrace tail call bug 6672627 until it is fixed in solaris 10. 89.17 #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() \ 89.18 do { volatile size_t dtrace_workaround_tail_call_bug = 1; } while (0) 89.19 89.20 -#if defined(SOLARIS) 89.21 +#define USDT1 1 89.22 +#elif defined(LINUX) 89.23 +#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() 89.24 #define USDT1 1 89.25 #elif defined(__APPLE__) 89.26 +#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() 89.27 #define USDT2 1 89.28 #include <sys/types.h> 89.29 #include "dtracefiles/hotspot.h" 89.30 @@ -63,6 +68,11 @@ 89.31 #define DTRACE_PROBE3(a,b,c,d,e) {;} 89.32 #define DTRACE_PROBE4(a,b,c,d,e,f) {;} 89.33 #define DTRACE_PROBE5(a,b,c,d,e,f,g) {;} 89.34 +#define DTRACE_PROBE6(a,b,c,d,e,f,g,h) {;} 89.35 +#define DTRACE_PROBE7(a,b,c,d,e,f,g,h,i) {;} 89.36 +#define DTRACE_PROBE8(a,b,c,d,e,f,g,h,i,j) {;} 89.37 +#define DTRACE_PROBE9(a,b,c,d,e,f,g,h,i,j,k) {;} 89.38 +#define DTRACE_PROBE10(a,b,c,d,e,f,g,h,i,j,k,l) {;} 89.39 89.40 #else /* USDT2 */ 89.41 89.42 @@ -76,10 +86,18 @@ 89.43 #define HS_DTRACE_PROBE_FN(provider,name)\ 89.44 __dtrace_##provider##___##name 89.45 89.46 +#ifdef SOLARIS 89.47 +// Solaris dtrace needs actual extern function decls. 89.48 #define HS_DTRACE_PROBE_DECL_N(provider,name,args) \ 89.49 DTRACE_ONLY(extern "C" void HS_DTRACE_PROBE_FN(provider,name) args) 89.50 #define HS_DTRACE_PROBE_CDECL_N(provider,name,args) \ 89.51 DTRACE_ONLY(extern void HS_DTRACE_PROBE_FN(provider,name) args) 89.52 +#else 89.53 +// Systemtap dtrace compatible probes on GNU/Linux don't. 89.54 +// If dtrace is disabled this macro becomes NULL 89.55 +#define HS_DTRACE_PROBE_DECL_N(provider,name,args) 89.56 +#define HS_DTRACE_PROBE_CDECL_N(provider,name,args) 89.57 +#endif 89.58 89.59 /* Dtrace probe declarations */ 89.60 #define HS_DTRACE_PROBE_DECL(provider,name) \ 89.61 @@ -118,6 +136,8 @@ 89.62 uintptr_t,uintptr_t,uintptr_t)) 89.63 89.64 /* Dtrace probe definitions */ 89.65 +#if defined(SOLARIS) 89.66 +// Solaris dtrace uses actual function calls. 89.67 #define HS_DTRACE_PROBE_N(provider,name, args) \ 89.68 DTRACE_ONLY(HS_DTRACE_PROBE_FN(provider,name) args) 89.69 89.70 @@ -153,6 +173,33 @@ 89.71 HS_DTRACE_PROBE_N(provider,name,((uintptr_t)a0,(uintptr_t)a1,(uintptr_t)a2,\ 89.72 (uintptr_t)a3,(uintptr_t)a4,(uintptr_t)a5,(uintptr_t)a6,(uintptr_t)a7,\ 89.73 (uintptr_t)a8,(uintptr_t)a9)) 89.74 +#else 89.75 +// Systemtap dtrace compatible probes on GNU/Linux use direct macros. 89.76 +// If dtrace is disabled this macro becomes NULL 89.77 +#define HS_DTRACE_PROBE(provider,name) HS_DTRACE_PROBE0(provider,name) 89.78 +#define HS_DTRACE_PROBE0(provider,name)\ 89.79 + DTRACE_PROBE(provider,name) 89.80 +#define HS_DTRACE_PROBE1(provider,name,a0)\ 89.81 + DTRACE_PROBE1(provider,name,a0) 89.82 +#define HS_DTRACE_PROBE2(provider,name,a0,a1)\ 89.83 + DTRACE_PROBE2(provider,name,a0,a1) 89.84 +#define HS_DTRACE_PROBE3(provider,name,a0,a1,a2)\ 89.85 + DTRACE_PROBE3(provider,name,a0,a1,a2) 89.86 +#define HS_DTRACE_PROBE4(provider,name,a0,a1,a2,a3)\ 89.87 + DTRACE_PROBE4(provider,name,a0,a1,a2,a3) 89.88 +#define HS_DTRACE_PROBE5(provider,name,a0,a1,a2,a3,a4)\ 89.89 + DTRACE_PROBE5(provider,name,a0,a1,a2,a3,a4) 89.90 +#define HS_DTRACE_PROBE6(provider,name,a0,a1,a2,a3,a4,a5)\ 89.91 + DTRACE_PROBE6(provider,name,a0,a1,a2,a3,a4,a5) 89.92 +#define HS_DTRACE_PROBE7(provider,name,a0,a1,a2,a3,a4,a5,a6)\ 89.93 + DTRACE_PROBE7(provider,name,a0,a1,a2,a3,a4,a5,a6) 89.94 +#define HS_DTRACE_PROBE8(provider,name,a0,a1,a2,a3,a4,a5,a6,a7)\ 89.95 + DTRACE_PROBE8(provider,name,a0,a1,a2,a3,a4,a5,a6,a7) 89.96 +#define HS_DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\ 89.97 + DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8) 89.98 +#define HS_DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9)\ 89.99 + DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9) 89.100 +#endif 89.101 89.102 #endif /* !USDT2 */ 89.103
90.1 --- a/test/runtime/7194254/Test7194254.java Fri Oct 05 13:37:08 2012 -0700 90.2 +++ b/test/runtime/7194254/Test7194254.java Tue Oct 09 07:41:27 2012 +0200 90.3 @@ -27,7 +27,7 @@ 90.4 * @summary Creates several threads with different java priorities and checks 90.5 * whether jstack reports correct priorities for them. 90.6 * 90.7 - * @run main T7194254 90.8 + * @run main Test7194254 90.9 */ 90.10 90.11 import java.io.BufferedReader;
91.1 --- a/test/runtime/7196045/Test7196045.java Fri Oct 05 13:37:08 2012 -0700 91.2 +++ b/test/runtime/7196045/Test7196045.java Tue Oct 09 07:41:27 2012 +0200 91.3 @@ -26,7 +26,7 @@ 91.4 * @test 91.5 * @bug 7196045 91.6 * @summary Possible JVM deadlock in ThreadTimesClosure when using HotspotInternal non-public API. 91.7 - * @run main/othervm 91.8 + * @run main/othervm Test7196045 91.9 */ 91.10 91.11 import java.lang.management.ManagementFactory;
