1.1 --- a/src/share/vm/ci/ciField.cpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/ci/ciField.cpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -79,15 +79,15 @@
1.4 constantPoolHandle cpool(thread, klass->get_instanceKlass()->constants());
1.5
1.6 // Get the field's name, signature, and type.
1.7 - symbolHandle name (thread, cpool->name_ref_at(index));
1.8 - _name = ciEnv::current(thread)->get_object(name())->as_symbol();
1.9 + Symbol* name = cpool->name_ref_at(index);
1.10 + _name = ciEnv::current(thread)->get_symbol(name);
1.11
1.12 int nt_index = cpool->name_and_type_ref_index_at(index);
1.13 int sig_index = cpool->signature_ref_index_at(nt_index);
1.14 - symbolHandle signature (thread, cpool->symbol_at(sig_index));
1.15 - _signature = ciEnv::current(thread)->get_object(signature())->as_symbol();
1.16 + Symbol* signature = cpool->symbol_at(sig_index);
1.17 + _signature = ciEnv::current(thread)->get_symbol(signature);
1.18
1.19 - BasicType field_type = FieldType::basic_type(signature());
1.20 + BasicType field_type = FieldType::basic_type(signature);
1.21
1.22 // If the field is a pointer type, get the klass of the
1.23 // field.
1.24 @@ -100,7 +100,7 @@
1.25 _type = ciType::make(field_type);
1.26 }
1.27
1.28 - _name = (ciSymbol*)ciEnv::current(thread)->get_object(name());
1.29 + _name = (ciSymbol*)ciEnv::current(thread)->get_symbol(name);
1.30
1.31 // Get the field's declared holder.
1.32 //
1.33 @@ -130,7 +130,7 @@
1.34 // Perform the field lookup.
1.35 fieldDescriptor field_desc;
1.36 klassOop canonical_holder =
1.37 - loaded_decl_holder->find_field(name(), signature(), &field_desc);
1.38 + loaded_decl_holder->find_field(name, signature, &field_desc);
1.39 if (canonical_holder == NULL) {
1.40 // Field lookup failed. Will be detected by will_link.
1.41 _holder = declared_holder;
1.42 @@ -150,8 +150,8 @@
1.43
1.44 // Get the field's name, signature, and type.
1.45 ciEnv* env = CURRENT_ENV;
1.46 - _name = env->get_object(fd->name())->as_symbol();
1.47 - _signature = env->get_object(fd->signature())->as_symbol();
1.48 + _name = env->get_symbol(fd->name());
1.49 + _signature = env->get_symbol(fd->signature());
1.50
1.51 BasicType field_type = fd->field_type();
1.52
