truffle: src/share/vm/interpreter/linkResolver.cpp comparison

comparison src/share/vm/interpreter/linkResolver.cpp @ 2177:3582bf76420e

6990754: Use native memory and reference counting to implement SymbolTable Summary: move symbols from permgen into C heap and reference count them Reviewed-by: never, acorn, jmasa, stefank

author	coleenp
date	Thu, 27 Jan 2011 16:11:27 -0800
parents	f95d63e2154a
children	72dee110246f

comparison

equal deleted inserted replaced

-:27e4ea99855d
+:3582bf76420e
 #endif
 //------------------------------------------------------------------------------------------------------------------------
 // Implementation of FieldAccessInfo
-void FieldAccessInfo::set(KlassHandle klass, symbolHandle name, int field_index, int field_offset,
+void FieldAccessInfo::set(KlassHandle klass, Symbol* name, int field_index, int field_offset,
 BasicType field_type, AccessFlags access_flags) {
 _klass        = klass;
 _name         = name;
 _field_index  = field_index;
 _field_offset = field_offset;
 sel_klass->as_klassOop(),
 true)) {
 ResourceMark rm(THREAD);
 Exceptions::fthrow(
 THREAD_AND_LOCATION,
-vmSymbolHandles::java_lang_IllegalAccessError(),
+vmSymbols::java_lang_IllegalAccessError(),
 "tried to access class %s from class %s",
 sel_klass->external_name(),
 ref_klass->external_name()
 );
 return;
 //------------------------------------------------------------------------------------------------------------------------
 // Method resolution
 //
 // According to JVM spec. $5.4.3c & $5.4.3d
-void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) {
+void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
-methodOop result_oop = klass->uncached_lookup_method(name(), signature());
+methodOop result_oop = klass->uncached_lookup_method(name, signature);
 if (EnableMethodHandles && result_oop != NULL) {
 switch (result_oop->intrinsic_id()) {
 case vmIntrinsics::_invokeExact:
 case vmIntrinsics::_invokeGeneric:
 case vmIntrinsics::_invokeDynamic:
 }
 result = methodHandle(THREAD, result_oop);
 }
 // returns first instance method
-void LinkResolver::lookup_instance_method_in_klasses(methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) {
+void LinkResolver::lookup_instance_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
-methodOop result_oop = klass->uncached_lookup_method(name(), signature());
+methodOop result_oop = klass->uncached_lookup_method(name, signature);
 result = methodHandle(THREAD, result_oop);
 while (!result.is_null() && result->is_static()) {
 klass = KlassHandle(THREAD, Klass::cast(result->method_holder())->super());
-result = methodHandle(THREAD, klass->uncached_lookup_method(name(), signature()));
+result = methodHandle(THREAD, klass->uncached_lookup_method(name, signature));
 }
 }
-int LinkResolver::vtable_index_of_miranda_method(KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) {
+int LinkResolver::vtable_index_of_miranda_method(KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
 ResourceMark rm(THREAD);
 klassVtable *vt = instanceKlass::cast(klass())->vtable();
-return vt->index_of_miranda(name(), signature());
+return vt->index_of_miranda(name, signature);
 }
-void LinkResolver::lookup_method_in_interfaces(methodHandle& result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) {
+void LinkResolver::lookup_method_in_interfaces(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
 instanceKlass *ik = instanceKlass::cast(klass());
-result = methodHandle(THREAD, ik->lookup_method_in_all_interfaces(name(), signature()));
+result = methodHandle(THREAD, ik->lookup_method_in_all_interfaces(name, signature));
 }
 void LinkResolver::lookup_implicit_method(methodHandle& result,
-KlassHandle klass, symbolHandle name, symbolHandle signature,
+KlassHandle klass, Symbol* name, Symbol* signature,
 KlassHandle current_klass,
 TRAPS) {
 if (EnableMethodHandles &&
 klass() == SystemDictionary::MethodHandle_klass() &&
-methodOopDesc::is_method_handle_invoke_name(name())) {
+methodOopDesc::is_method_handle_invoke_name(name)) {
 if (!MethodHandles::enabled()) {
 // Make sure the Java part of the runtime has been booted up.
 klassOop natives = SystemDictionary::MethodHandleNatives_klass();
 if (natives == NULL || instanceKlass::cast(natives)->is_not_initialized()) {
-SystemDictionary::resolve_or_fail(vmSymbolHandles::sun_dyn_MethodHandleNatives(),
+SystemDictionary::resolve_or_fail(vmSymbols::sun_dyn_MethodHandleNatives(),
 Handle(),
 Handle(),
 true,
 CHECK);
 }
 methodOop result_oop = SystemDictionary::find_method_handle_invoke(name,
 signature,
 current_klass,
 CHECK);
 if (result_oop != NULL) {
-assert(result_oop->is_method_handle_invoke() && result_oop->signature() == signature(), "consistent");
+assert(result_oop->is_method_handle_invoke() && result_oop->signature() == signature, "consistent");
 result = methodHandle(THREAD, result_oop);
 }
 }
 }
 flags,
 true)) {
 ResourceMark rm(THREAD);
 Exceptions::fthrow(
 THREAD_AND_LOCATION,
-vmSymbolHandles::java_lang_IllegalAccessError(),
+vmSymbols::java_lang_IllegalAccessError(),
 "tried to access method %s.%s%s from class %s",
 sel_klass->external_name(),
 sel_method->name()->as_C_string(),
 sel_method->signature()->as_C_string(),
 ref_klass->external_name()
 constantPoolHandle pool, int index, TRAPS) {
 // resolve klass
 resolve_klass(resolved_klass, pool, index, CHECK);
-symbolHandle method_name      (THREAD, pool->name_ref_at(index));
+Symbol*  method_name       = pool->name_ref_at(index);
-symbolHandle method_signature (THREAD, pool->signature_ref_at(index));
+Symbol*  method_signature  = pool->signature_ref_at(index);
 KlassHandle  current_klass(THREAD, pool->pool_holder());
 resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
 }
 void LinkResolver::resolve_dynamic_method(methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS) {
 // The class is java.dyn.MethodHandle
 resolved_klass = SystemDictionaryHandles::MethodHandle_klass();
-symbolHandle method_name = vmSymbolHandles::invokeExact_name();
+Symbol* method_name = vmSymbols::invokeExact_name();
-symbolHandle method_signature(THREAD, pool->signature_ref_at(index));
+Symbol*  method_signature = pool->signature_ref_at(index);
 KlassHandle  current_klass   (THREAD, pool->pool_holder());
 resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
 }
 void LinkResolver::resolve_interface_method(methodHandle& resolved_method, KlassHandle& resolved_klass, constantPoolHandle pool, int index, TRAPS) {
 // resolve klass
 resolve_klass(resolved_klass, pool, index, CHECK);
-symbolHandle method_name      (THREAD, pool->name_ref_at(index));
+Symbol*  method_name       = pool->name_ref_at(index);
-symbolHandle method_signature (THREAD, pool->signature_ref_at(index));
+Symbol*  method_signature  = pool->signature_ref_at(index);
 KlassHandle  current_klass(THREAD, pool->pool_holder());
 resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
 }
 void LinkResolver::resolve_method(methodHandle& resolved_method, KlassHandle resolved_klass,
-symbolHandle method_name, symbolHandle method_signature,
+Symbol* method_name, Symbol* method_signature,
 KlassHandle current_klass, bool check_access, TRAPS) {
 // 1. check if klass is not interface
 if (resolved_klass->is_interface()) {
 char buf[200];
 if (resolved_method.is_null()) {
 // 4. method lookup failed
 ResourceMark rm(THREAD);
 THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(),
 methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
-method_name(),
+method_name,
-method_signature()));
+method_signature));
 }
 }
 // 5. check if method is concrete
 if (resolved_method->is_abstract() && !resolved_klass->is_abstract()) {
 ResourceMark rm(THREAD);
 THROW_MSG(vmSymbols::java_lang_AbstractMethodError(),
 methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
-method_name(),
+method_name,
-method_signature()));
+method_signature));
 }
 // 6. access checks, access checking may be turned off when calling from within the VM.
 if (check_access) {
 assert(current_klass.not_null() , "current_klass should not be null");
 if (failed_type_name != NULL) {
 const char* msg = "loader constraint violation: when resolving method"
 " \"%s\" the class loader (instance of %s) of the current class, %s,"
 " and the class loader (instance of %s) for resolved class, %s, have"
 " different Class objects for the type %s used in the signature";
-char* sig = methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),method_name(),method_signature());
+char* sig = methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),method_name,method_signature);
 const char* loader1 = SystemDictionary::loader_name(loader());
 char* current = instanceKlass::cast(current_klass())->name()->as_C_string();
 const char* loader2 = SystemDictionary::loader_name(class_loader());
 char* resolved = instanceKlass::cast(resolved_klass())->name()->as_C_string();
 size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) +
 }
 }
 void LinkResolver::resolve_interface_method(methodHandle& resolved_method,
 KlassHandle resolved_klass,
-symbolHandle method_name,
+Symbol* method_name,
-symbolHandle method_signature,
+Symbol* method_signature,
 KlassHandle current_klass,
 bool check_access, TRAPS) {
 // check if klass is interface
 if (!resolved_klass->is_interface()) {
 if (resolved_method.is_null()) {
 // no method found
 ResourceMark rm(THREAD);
 THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(),
 methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
-method_name(),
+method_name,
-method_signature()));
+method_signature));
 }
 }
 if (check_access) {
 HandleMark hm(THREAD);
 const char* msg = "loader constraint violation: when resolving "
 "interface method \"%s\" the class loader (instance of %s) of the "
 "current class, %s, and the class loader (instance of %s) for "
 "resolved class, %s, have different Class objects for the type %s "
 "used in the signature";
-char* sig = methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),method_name(),method_signature());
+char* sig = methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),method_name,method_signature);
 const char* loader1 = SystemDictionary::loader_name(loader());
 char* current = instanceKlass::cast(current_klass())->name()->as_C_string();
 const char* loader2 = SystemDictionary::loader_name(class_loader());
 char* resolved = instanceKlass::cast(resolved_klass())->name()->as_C_string();
 size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) +
 fd.access_flags(),
 true)) {
 ResourceMark rm(THREAD);
 Exceptions::fthrow(
 THREAD_AND_LOCATION,
-vmSymbolHandles::java_lang_IllegalAccessError(),
+vmSymbols::java_lang_IllegalAccessError(),
 "tried to access field %s.%s from class %s",
 sel_klass->external_name(),
 fd.name()->as_C_string(),
 ref_klass->external_name()
 );
 resolve_klass(resolved_klass, pool, index, CHECK);
 } else {
 resolve_klass_no_update(resolved_klass, pool, index, CHECK);
 }
 // Load these early in case the resolve of the containing klass fails
-symbolOop field = pool->name_ref_at(index);
+Symbol* field = pool->name_ref_at(index);
-symbolHandle field_h (THREAD, field); // preserve in case we need the name
+Symbol* sig   = pool->signature_ref_at(index);
-symbolOop sig   = pool->signature_ref_at(index);
 // Check if there's a resolved klass containing the field
 if( resolved_klass.is_null() ) {
 ResourceMark rm(THREAD);
 THROW_MSG(vmSymbols::java_lang_NoSuchFieldError(), field->as_C_string());
 }
 {
 HandleMark hm(THREAD);
 Handle ref_loader (THREAD, instanceKlass::cast(ref_klass())->class_loader());
 Handle sel_loader (THREAD, instanceKlass::cast(sel_klass())->class_loader());
-symbolHandle signature_ref (THREAD, pool->signature_ref_at(index));
+Symbol*  signature_ref  = pool->signature_ref_at(index);
 {
 ResourceMark rm(THREAD);
 char* failed_type_name =
 SystemDictionary::check_signature_loaders(signature_ref,
 ref_loader, sel_loader,
 if (failed_type_name != NULL) {
 const char* msg = "loader constraint violation: when resolving field"
 " \"%s\" the class loader (instance of %s) of the referring class, "
 "%s, and the class loader (instance of %s) for the field's resolved "
 "type, %s, have different Class objects for that type";
-char* field_name = field_h()->as_C_string();
+char* field_name = field->as_C_string();
 const char* loader1 = SystemDictionary::loader_name(ref_loader());
 char* sel = instanceKlass::cast(sel_klass())->name()->as_C_string();
 const char* loader2 = SystemDictionary::loader_name(sel_loader());
 size_t buflen = strlen(msg) + strlen(field_name) + strlen(loader1) +
 strlen(sel) + strlen(loader2) + strlen(failed_type_name);
 }
 // return information. note that the klass is set to the actual klass containing the
 // field, otherwise access of static fields in superclasses will not work.
 KlassHandle holder (THREAD, fd.field_holder());
-symbolHandle name  (THREAD, fd.name());
+Symbol*  name   = fd.name();
 result.set(holder, name, fd.index(), fd.offset(), fd.field_type(), fd.access_flags());
 }
 //------------------------------------------------------------------------------------------------------------------------
 // sel_method         the selected method  (selected via run-time lookup; e.g., based on dynamic receiver class)
 // resolved_klass     the specified klass  (i.e., specified via constant pool index)
 // recv_klass         the receiver klass
-void LinkResolver::resolve_static_call(CallInfo& result, KlassHandle& resolved_klass, symbolHandle method_name,
+void LinkResolver::resolve_static_call(CallInfo& result, KlassHandle& resolved_klass, Symbol* method_name,
-symbolHandle method_signature, KlassHandle current_klass,
+Symbol* method_signature, KlassHandle current_klass,
 bool check_access, bool initialize_class, TRAPS) {
 methodHandle resolved_method;
 linktime_resolve_static_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
 resolved_klass = KlassHandle(THREAD, Klass::cast(resolved_method->method_holder()));
 result.set_static(resolved_klass, resolved_method, CHECK);
 }
 // throws linktime exceptions
 void LinkResolver::linktime_resolve_static_method(methodHandle& resolved_method, KlassHandle resolved_klass,
-symbolHandle method_name, symbolHandle method_signature,
+Symbol* method_name, Symbol* method_signature,
 KlassHandle current_klass, bool check_access, TRAPS) {
 resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
 assert(resolved_method->name() != vmSymbols::class_initializer_name(), "should have been checked in verifier");
 THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
 }
 }
-void LinkResolver::resolve_special_call(CallInfo& result, KlassHandle resolved_klass, symbolHandle method_name,
+void LinkResolver::resolve_special_call(CallInfo& result, KlassHandle resolved_klass, Symbol* method_name,
-symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS) {
+Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS) {
 methodHandle resolved_method;
 linktime_resolve_special_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
 runtime_resolve_special_method(result, resolved_method, resolved_klass, current_klass, check_access, CHECK);
 }
 // throws linktime exceptions
 void LinkResolver::linktime_resolve_special_method(methodHandle& resolved_method, KlassHandle resolved_klass,
-symbolHandle method_name, symbolHandle method_signature,
+Symbol* method_name, Symbol* method_signature,
 KlassHandle current_klass, bool check_access, TRAPS) {
 resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
 // check if method name is <init>, that it is found in same klass as static type
 if (resolved_method->name() == vmSymbols::object_initializer_name() &&
 resolved_method->method_holder() != resolved_klass()) {
 ResourceMark rm(THREAD);
 Exceptions::fthrow(
 THREAD_AND_LOCATION,
-vmSymbolHandles::java_lang_NoSuchMethodError(),
+vmSymbols::java_lang_NoSuchMethodError(),
 "%s: method %s%s not found",
 resolved_klass->external_name(),
 resolved_method->name()->as_C_string(),
 resolved_method->signature()->as_C_string()
 );
 // c) check if the method is not <init>
 resolved_method->name() != vmSymbols::object_initializer_name()) {
 // Lookup super method
 KlassHandle super_klass(THREAD, current_klass->super());
 lookup_instance_method_in_klasses(sel_method, super_klass,
-symbolHandle(THREAD, resolved_method->name()),
+resolved_method->name(),
-symbolHandle(THREAD, resolved_method->signature()), CHECK);
+resolved_method->signature(), CHECK);
 // check if found
 if (sel_method.is_null()) {
 ResourceMark rm(THREAD);
 THROW_MSG(vmSymbols::java_lang_AbstractMethodError(),
 methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
 // setup result
 result.set_static(resolved_klass, sel_method, CHECK);
 }
 void LinkResolver::resolve_virtual_call(CallInfo& result, Handle recv, KlassHandle receiver_klass, KlassHandle resolved_klass,
-symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass,
+Symbol* method_name, Symbol* method_signature, KlassHandle current_klass,
 bool check_access, bool check_null_and_abstract, TRAPS) {
 methodHandle resolved_method;
 linktime_resolve_virtual_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
 runtime_resolve_virtual_method(result, resolved_method, resolved_klass, recv, receiver_klass, check_null_and_abstract, CHECK);
 }
 // throws linktime exceptions
 void LinkResolver::linktime_resolve_virtual_method(methodHandle &resolved_method, KlassHandle resolved_klass,
-symbolHandle method_name, symbolHandle method_signature,
+Symbol* method_name, Symbol* method_signature,
 KlassHandle current_klass, bool check_access, TRAPS) {
 // normal method resolution
 resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
 assert(resolved_method->name() != vmSymbols::object_initializer_name(), "should have been checked in verifier");
 assert(instanceKlass::cast(resolved_method->method_holder())->is_linked(), "must be linked");
 // do lookup based on receiver klass using the vtable index
 if (resolved_method->method_holder()->klass_part()->is_interface()) { // miranda method
 vtable_index = vtable_index_of_miranda_method(resolved_klass,
-symbolHandle(THREAD, resolved_method->name()),
+resolved_method->name(),
-symbolHandle(THREAD, resolved_method->signature()), CHECK);
+resolved_method->signature(), CHECK);
 assert(vtable_index >= 0 , "we should have valid vtable index at this point");
 instanceKlass* inst = instanceKlass::cast(recv_klass());
 selected_method = methodHandle(THREAD, inst->method_at_vtable(vtable_index));
 } else {
 // setup result
 result.set_virtual(resolved_klass, recv_klass, resolved_method, selected_method, vtable_index, CHECK);
 }
 void LinkResolver::resolve_interface_call(CallInfo& result, Handle recv, KlassHandle recv_klass, KlassHandle resolved_klass,
-symbolHandle method_name, symbolHandle method_signature, KlassHandle current_klass,
+Symbol* method_name, Symbol* method_signature, KlassHandle current_klass,
 bool check_access, bool check_null_and_abstract, TRAPS) {
 methodHandle resolved_method;
 linktime_resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
 runtime_resolve_interface_method(result, resolved_method, resolved_klass, recv, recv_klass, check_null_and_abstract, CHECK);
 }
 // throws linktime exceptions
-void LinkResolver::linktime_resolve_interface_method(methodHandle& resolved_method, KlassHandle resolved_klass, symbolHandle method_name,
+void LinkResolver::linktime_resolve_interface_method(methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name,
-symbolHandle method_signature, KlassHandle current_klass, bool check_access, TRAPS) {
+Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS) {
 // normal interface method resolution
 resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
 assert(resolved_method->name() != vmSymbols::object_initializer_name(), "should have been checked in verifier");
 assert(resolved_method->name() != vmSymbols::class_initializer_name (), "should have been checked in verifier");
 THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
 }
 // do lookup based on receiver klass
 methodHandle sel_method;
 lookup_instance_method_in_klasses(sel_method, recv_klass,
-symbolHandle(THREAD, resolved_method->name()),
+resolved_method->name(),
-symbolHandle(THREAD, resolved_method->signature()), CHECK);
+resolved_method->signature(), CHECK);
 // check if method exists
 if (sel_method.is_null()) {
 ResourceMark rm(THREAD);
 THROW_MSG(vmSymbols::java_lang_AbstractMethodError(),
 methodOopDesc::name_and_sig_as_C_string(Klass::cast(recv_klass()),
 }
 methodHandle LinkResolver::linktime_resolve_interface_method_or_null(
 KlassHandle resolved_klass,
-symbolHandle method_name,
+Symbol* method_name,
-symbolHandle method_signature,
+Symbol* method_signature,
 KlassHandle current_klass,
 bool check_access) {
 EXCEPTION_MARK;
 methodHandle method_result;
 linktime_resolve_interface_method(method_result, resolved_klass, method_name, method_signature, current_klass, check_access, THREAD);
 }
 }
 methodHandle LinkResolver::linktime_resolve_virtual_method_or_null(
 KlassHandle resolved_klass,
-symbolHandle method_name,
+Symbol* method_name,
-symbolHandle method_signature,
+Symbol* method_signature,
 KlassHandle current_klass,
 bool check_access) {
 EXCEPTION_MARK;
 methodHandle method_result;
 linktime_resolve_virtual_method(method_result, resolved_klass, method_name, method_signature, current_klass, check_access, THREAD);
 }
 methodHandle LinkResolver::resolve_virtual_call_or_null(
 KlassHandle receiver_klass,
 KlassHandle resolved_klass,
-symbolHandle name,
+Symbol* name,
-symbolHandle signature,
+Symbol* signature,
 KlassHandle current_klass) {
 EXCEPTION_MARK;
 CallInfo info;
 resolve_virtual_call(info, Handle(), receiver_klass, resolved_klass, name, signature, current_klass, true, false, THREAD);
 if (HAS_PENDING_EXCEPTION) {
 }
 methodHandle LinkResolver::resolve_interface_call_or_null(
 KlassHandle receiver_klass,
 KlassHandle resolved_klass,
-symbolHandle name,
+Symbol* name,
-symbolHandle signature,
+Symbol* signature,
 KlassHandle current_klass) {
 EXCEPTION_MARK;
 CallInfo info;
 resolve_interface_call(info, Handle(), receiver_klass, resolved_klass, name, signature, current_klass, true, false, THREAD);
 if (HAS_PENDING_EXCEPTION) {
 }
 int LinkResolver::resolve_virtual_vtable_index(
 KlassHandle receiver_klass,
 KlassHandle resolved_klass,
-symbolHandle name,
+Symbol* name,
-symbolHandle signature,
+Symbol* signature,
 KlassHandle current_klass) {
 EXCEPTION_MARK;
 CallInfo info;
 resolve_virtual_call(info, Handle(), receiver_klass, resolved_klass, name, signature, current_klass, true, false, THREAD);
 if (HAS_PENDING_EXCEPTION) {
 return info.vtable_index();
 }
 methodHandle LinkResolver::resolve_static_call_or_null(
 KlassHandle resolved_klass,
-symbolHandle name,
+Symbol* name,
-symbolHandle signature,
+Symbol* signature,
 KlassHandle current_klass) {
 EXCEPTION_MARK;
 CallInfo info;
 resolve_static_call(info, resolved_klass, name, signature, current_klass, true, false, THREAD);
 if (HAS_PENDING_EXCEPTION) {
 return methodHandle();
 }
 return info.selected_method();
 }
-methodHandle LinkResolver::resolve_special_call_or_null(KlassHandle resolved_klass, symbolHandle name, symbolHandle signature,
+methodHandle LinkResolver::resolve_special_call_or_null(KlassHandle resolved_klass, Symbol* name, Symbol* signature,
 KlassHandle current_klass) {
 EXCEPTION_MARK;
 CallInfo info;
 resolve_special_call(info, resolved_klass, name, signature, current_klass, true, THREAD);
 if (HAS_PENDING_EXCEPTION) {
 case Bytecodes::_invokeinterface: resolve_invokeinterface(result, recv, pool, index, CHECK); break;
 }
 return;
 }
-void LinkResolver::resolve_pool(KlassHandle& resolved_klass, symbolHandle& method_name, symbolHandle& method_signature,
+void LinkResolver::resolve_pool(KlassHandle& resolved_klass, Symbol*& method_name, Symbol*& method_signature,
 KlassHandle& current_klass, constantPoolHandle pool, int index, TRAPS) {
 // resolve klass
 resolve_klass(resolved_klass, pool, index, CHECK);
 // Get name, signature, and static klass
-method_name      = symbolHandle(THREAD, pool->name_ref_at(index));
+method_name      = pool->name_ref_at(index);
-method_signature = symbolHandle(THREAD, pool->signature_ref_at(index));
+method_signature = pool->signature_ref_at(index);
 current_klass    = KlassHandle(THREAD, pool->pool_holder());
 }
 void LinkResolver::resolve_invokestatic(CallInfo& result, constantPoolHandle pool, int index, TRAPS) {
 KlassHandle  resolved_klass;
-symbolHandle method_name;
+Symbol* method_name = NULL;
-symbolHandle method_signature;
+Symbol* method_signature = NULL;
 KlassHandle  current_klass;
 resolve_pool(resolved_klass, method_name,  method_signature, current_klass, pool, index, CHECK);
 resolve_static_call(result, resolved_klass, method_name, method_signature, current_klass, true, true, CHECK);
 }
 void LinkResolver::resolve_invokespecial(CallInfo& result, constantPoolHandle pool, int index, TRAPS) {
 KlassHandle  resolved_klass;
-symbolHandle method_name;
+Symbol* method_name = NULL;
-symbolHandle method_signature;
+Symbol* method_signature = NULL;
 KlassHandle  current_klass;
 resolve_pool(resolved_klass, method_name,  method_signature, current_klass, pool, index, CHECK);
 resolve_special_call(result, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
 }
 void LinkResolver::resolve_invokevirtual(CallInfo& result, Handle recv,
 constantPoolHandle pool, int index,
 TRAPS) {
 KlassHandle  resolved_klass;
-symbolHandle method_name;
+Symbol* method_name = NULL;
-symbolHandle method_signature;
+Symbol* method_signature = NULL;
 KlassHandle  current_klass;
 resolve_pool(resolved_klass, method_name,  method_signature, current_klass, pool, index, CHECK);
 KlassHandle recvrKlass (THREAD, recv.is_null() ? (klassOop)NULL : recv->klass());
 resolve_virtual_call(result, recv, recvrKlass, resolved_klass, method_name, method_signature, current_klass, true, true, CHECK);
 }
 void LinkResolver::resolve_invokeinterface(CallInfo& result, Handle recv, constantPoolHandle pool, int index, TRAPS) {
 KlassHandle  resolved_klass;
-symbolHandle method_name;
+Symbol* method_name = NULL;
-symbolHandle method_signature;
+Symbol* method_signature = NULL;
 KlassHandle  current_klass;
 resolve_pool(resolved_klass, method_name,  method_signature, current_klass, pool, index, CHECK);
 KlassHandle recvrKlass (THREAD, recv.is_null() ? (klassOop)NULL : recv->klass());
 resolve_interface_call(result, recv, recvrKlass, resolved_klass, method_name, method_signature, current_klass, true, true, CHECK);
 }
 assert(EnableInvokeDynamic, "");
 // This guy is reached from InterpreterRuntime::resolve_invokedynamic.
 // At this point, we only need the signature, and can ignore the name.
-symbolHandle method_signature(THREAD, pool->signature_ref_at(raw_index));  // raw_index works directly
+Symbol*  method_signature = pool->signature_ref_at(raw_index);  // raw_index works directly
-symbolHandle method_name = vmSymbolHandles::invokeExact_name();
+Symbol* method_name = vmSymbols::invokeExact_name();
 KlassHandle resolved_klass = SystemDictionaryHandles::MethodHandle_klass();
 // JSR 292:  this must be an implicitly generated method MethodHandle.invokeExact(*...)
 // The extra MH receiver will be inserted into the stack on every call.
 methodHandle resolved_method;

Mercurial > hg > truffle

comparison src/share/vm/interpreter/linkResolver.cpp @ 2177:3582bf76420e