comparison src/share/vm/graal/graalCompilerToVM.cpp @ 7811:94ea9a864fc6

Remove usages of VmIds.toString.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 18 Feb 2013 19:08:52 -0800
parents 5aa05e6f9dee
children a42dc71ad051
comparison
equal deleted inserted replaced
7810:5aa05e6f9dee 7811:94ea9a864fc6
118 C2V_END 118 C2V_END
119 119
120 C2V_VMENTRY(jstring, getSignature, (JNIEnv *env, jobject, jlong metaspace_method)) 120 C2V_VMENTRY(jstring, getSignature, (JNIEnv *env, jobject, jlong metaspace_method))
121 Method* method = asMethod(metaspace_method); 121 Method* method = asMethod(metaspace_method);
122 assert(method != NULL && method->signature() != NULL, "signature required"); 122 assert(method != NULL && method->signature() != NULL, "signature required");
123 return VmIds::toString<jstring>(method->signature(), THREAD); 123 return (jstring)JNIHandles::make_local(java_lang_String::create_from_symbol(method->signature(), THREAD)());
124 C2V_END 124 C2V_END
125 125
126 C2V_VMENTRY(jobjectArray, initializeExceptionHandlers, (JNIEnv *, jobject, jlong metaspace_method, jobjectArray java_handlers)) 126 C2V_VMENTRY(jobjectArray, initializeExceptionHandlers, (JNIEnv *, jobject, jlong metaspace_method, jobjectArray java_handlers))
127 ResourceMark rm; 127 ResourceMark rm;
128 methodHandle method = asMethod(metaspace_method); 128 methodHandle method = asMethod(metaspace_method);
269 return method->invocation_count(); 269 return method->invocation_count();
270 C2V_END 270 C2V_END
271 271
272 C2V_VMENTRY(void, initializeMethod,(JNIEnv *, jobject, jlong metaspace_method, jobject hotspot_method)) 272 C2V_VMENTRY(void, initializeMethod,(JNIEnv *, jobject, jlong metaspace_method, jobject hotspot_method))
273 methodHandle method = asMethod(metaspace_method); 273 methodHandle method = asMethod(metaspace_method);
274 Handle name = VmIds::toString<Handle>(method->name(), CHECK); 274 Handle name = java_lang_String::create_from_symbol(method->name(), CHECK);
275 InstanceKlass::cast(HotSpotResolvedJavaMethod::klass())->initialize(CHECK); 275 InstanceKlass::cast(HotSpotResolvedJavaMethod::klass())->initialize(CHECK);
276 HotSpotResolvedJavaMethod::set_name(hotspot_method, name()); 276 HotSpotResolvedJavaMethod::set_name(hotspot_method, name());
277 HotSpotResolvedJavaMethod::set_codeSize(hotspot_method, method->code_size()); 277 HotSpotResolvedJavaMethod::set_codeSize(hotspot_method, method->code_size());
278 HotSpotResolvedJavaMethod::set_exceptionHandlerCount(hotspot_method, method->exception_table_length()); 278 HotSpotResolvedJavaMethod::set_exceptionHandlerCount(hotspot_method, method->exception_table_length());
279 C2V_END 279 C2V_END
430 if (!method.is_null()) { 430 if (!method.is_null()) {
431 Handle holder = GraalCompiler::get_JavaType(method->method_holder(), CHECK_NULL); 431 Handle holder = GraalCompiler::get_JavaType(method->method_holder(), CHECK_NULL);
432 return JNIHandles::make_local(THREAD, VMToCompiler::createResolvedJavaMethod(holder, method(), THREAD)); 432 return JNIHandles::make_local(THREAD, VMToCompiler::createResolvedJavaMethod(holder, method(), THREAD));
433 } else { 433 } else {
434 // Get the method's name and signature. 434 // Get the method's name and signature.
435 Handle name = VmIds::toString<Handle>(cp->name_ref_at(index), CHECK_NULL); 435 Handle name = java_lang_String::create_from_symbol(cp->name_ref_at(index), CHECK_NULL);
436 Handle signature = VmIds::toString<Handle>(cp->signature_ref_at(index), CHECK_NULL); 436 Handle signature = java_lang_String::create_from_symbol(cp->signature_ref_at(index), CHECK_NULL);
437 int holder_index = cp->klass_ref_index_at(index); 437 int holder_index = cp->klass_ref_index_at(index);
438 Handle type = GraalCompiler::get_JavaType(cp, holder_index, cp->pool_holder(), CHECK_NULL); 438 Handle type = GraalCompiler::get_JavaType(cp, holder_index, cp->pool_holder(), CHECK_NULL);
439 return JNIHandles::make_local(THREAD, VMToCompiler::createUnresolvedJavaMethod(name, signature, type, THREAD)); 439 return JNIHandles::make_local(THREAD, VMToCompiler::createUnresolvedJavaMethod(name, signature, type, THREAD));
440 } 440 }
441 C2V_END 441 C2V_END
549 for (AllFieldStream fs(k()); !fs.done(); fs.next()) { 549 for (AllFieldStream fs(k()); !fs.done(); fs.next()) {
550 if (!fs.access_flags().is_static()) { 550 if (!fs.access_flags().is_static()) {
551 Handle type = GraalCompiler::get_JavaTypeFromSignature(fs.signature(), k, Thread::current()); 551 Handle type = GraalCompiler::get_JavaTypeFromSignature(fs.signature(), k, Thread::current());
552 int flags = fs.access_flags().as_int(); 552 int flags = fs.access_flags().as_int();
553 bool internal = fs.access_flags().is_internal(); 553 bool internal = fs.access_flags().is_internal();
554 Handle name = VmIds::toString<Handle>(fs.name(), Thread::current()); 554 Handle name = java_lang_String::create_from_symbol(fs.name(), Thread::current());
555 Handle field = VMToCompiler::createJavaField(JNIHandles::resolve(klass), name, type, fs.offset(), flags, internal, Thread::current()); 555 Handle field = VMToCompiler::createJavaField(JNIHandles::resolve(klass), name, type, fs.offset(), flags, internal, Thread::current());
556 fields.append(field()); 556 fields.append(field());
557 } 557 }
558 } 558 }
559 objArrayHandle field_array = oopFactory::new_objArray(SystemDictionary::HotSpotResolvedJavaField_klass(), fields.length(), CHECK_NULL); 559 objArrayHandle field_array = oopFactory::new_objArray(SystemDictionary::HotSpotResolvedJavaField_klass(), fields.length(), CHECK_NULL);