1.1 --- a/src/share/vm/classfile/vmSymbols.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/classfile/vmSymbols.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -181,7 +181,7 @@
1.4 }
1.5 }
1.6
1.7 -void vmSymbols::serialize(SerializeOopClosure* soc) {
1.8 +void vmSymbols::serialize(SerializeClosure* soc) {
1.9 soc->do_region((u_char*)&_symbols[FIRST_SID],
1.10 (SID_LIMIT - FIRST_SID) * sizeof(_symbols[0]));
1.11 soc->do_region((u_char*)_type_signatures, sizeof(_type_signatures));
1.12 @@ -211,7 +211,7 @@
1.13 // Then, use a binary search over the index.
1.14 // Expected trip count is less than log2_SID_LIMIT, about eight.
1.15 // This is slow but acceptable, given that calls are not
1.16 - // dynamically common. (methodOop::intrinsic_id has a cache.)
1.17 + // dynamically common. (Method*::intrinsic_id has a cache.)
1.18 NOT_PRODUCT(find_sid_calls++);
1.19 int min = (int)FIRST_SID, max = (int)SID_LIMIT - 1;
1.20 SID sid = NO_SID, sid1;
1.21 @@ -324,20 +324,20 @@
1.22 return vmIntrinsics::_none;
1.23 }
1.24
1.25 -methodOop vmIntrinsics::method_for(vmIntrinsics::ID id) {
1.26 +Method* vmIntrinsics::method_for(vmIntrinsics::ID id) {
1.27 if (id == _none) return NULL;
1.28 Symbol* cname = vmSymbols::symbol_at(class_for(id));
1.29 Symbol* mname = vmSymbols::symbol_at(name_for(id));
1.30 Symbol* msig = vmSymbols::symbol_at(signature_for(id));
1.31 if (cname == NULL || mname == NULL || msig == NULL) return NULL;
1.32 - klassOop k = SystemDictionary::find_well_known_klass(cname);
1.33 + Klass* k = SystemDictionary::find_well_known_klass(cname);
1.34 if (k == NULL) return NULL;
1.35 - methodOop m = instanceKlass::cast(k)->find_method(mname, msig);
1.36 + Method* m = InstanceKlass::cast(k)->find_method(mname, msig);
1.37 if (m == NULL &&
1.38 cname == vmSymbols::java_lang_invoke_MethodHandle() &&
1.39 msig == vmSymbols::star_name()) {
1.40 // Any signature polymorphic method is represented by a fixed concrete signature:
1.41 - m = instanceKlass::cast(k)->find_method(mname, vmSymbols::object_array_object_signature());
1.42 + m = InstanceKlass::cast(k)->find_method(mname, vmSymbols::object_array_object_signature());
1.43 }
1.44 return m;
1.45 }
1.46 @@ -504,12 +504,12 @@
1.47 #ifndef PRODUCT
1.48 // verify_method performs an extra check on a matched intrinsic method
1.49
1.50 -static bool match_method(methodOop m, Symbol* n, Symbol* s) {
1.51 +static bool match_method(Method* m, Symbol* n, Symbol* s) {
1.52 return (m->name() == n &&
1.53 m->signature() == s);
1.54 }
1.55
1.56 -static vmIntrinsics::ID match_method_with_klass(methodOop m, Symbol* mk) {
1.57 +static vmIntrinsics::ID match_method_with_klass(Method* m, Symbol* mk) {
1.58 #define VM_INTRINSIC_MATCH(id, klassname, namepart, sigpart, flags) \
1.59 { Symbol* k = vmSymbols::klassname(); \
1.60 if (mk == k) { \
1.61 @@ -524,7 +524,7 @@
1.62 #undef VM_INTRINSIC_MATCH
1.63 }
1.64
1.65 -void vmIntrinsics::verify_method(ID actual_id, methodOop m) {
1.66 +void vmIntrinsics::verify_method(ID actual_id, Method* m) {
1.67 Symbol* mk = Klass::cast(m->method_holder())->name();
1.68 ID declared_id = match_method_with_klass(m, mk);
1.69
