Mercurial > hg > truffle
changeset 7812:a42dc71ad051
Remove usages of VmIds.toSymbol.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Mon, 18 Feb 2013 19:12:32 -0800 |
| parents | 94ea9a864fc6 |
| children | c58f8f4cda69 |
| files | src/share/vm/graal/graalCompilerToVM.cpp src/share/vm/graal/graalVmIds.hpp |
| diffstat | 2 files changed, 3 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp Mon Feb 18 19:08:52 2013 -0800 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Mon Feb 18 19:12:32 2013 -0800 @@ -323,8 +323,8 @@ C2V_VMENTRY(jobject, lookupType, (JNIEnv *env, jobject, jstring jname, jobject accessingClass, jboolean eagerResolve)) ResourceMark rm; - Symbol* nameSymbol = VmIds::toSymbol(jname); Handle name = JNIHandles::resolve(jname); + Symbol* nameSymbol = java_lang_String::as_symbol(name, THREAD); assert(nameSymbol != NULL, "name to symbol creation failed"); oop result = NULL; @@ -514,8 +514,8 @@ assert(JNIHandles::resolve(resolved_type) != NULL, ""); Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectType::javaMirror(resolved_type)); - Symbol* name_symbol = VmIds::toSymbol(name); - Symbol* signature_symbol = VmIds::toSymbol(signature); + Symbol* name_symbol = java_lang_String::as_symbol(JNIHandles::resolve(name), THREAD); + Symbol* signature_symbol = java_lang_String::as_symbol(JNIHandles::resolve(signature), THREAD); methodHandle method = klass->lookup_method(name_symbol, signature_symbol); if (method.is_null()) { if (TraceGraal >= 3) {
--- a/src/share/vm/graal/graalVmIds.hpp Mon Feb 18 19:08:52 2013 -0800 +++ b/src/share/vm/graal/graalVmIds.hpp Mon Feb 18 19:12:32 2013 -0800 @@ -39,9 +39,6 @@ // Returns the stub address with the given vmId taken from a java.lang.Long static address getStub(oop id); - // Helper function to convert a java.lang.String object to a symbol (this will return NULL if the symbol doesn't exist in the system) - static Symbol* toSymbol(jstring string); - // Helper function to get the contents of a java.lang.Long static jlong getBoxedLong(oop obj); }; @@ -50,10 +47,6 @@ return (address)(getBoxedLong(obj)); } -inline Symbol* VmIds::toSymbol(jstring string) { - return java_lang_String::as_symbol(JNIHandles::resolve(string), Thread::current()); -} - inline jlong VmIds::getBoxedLong(oop obj) { assert(obj->is_oop(true), "cannot unbox null or non-oop"); return obj->long_field(java_lang_boxing_object::value_offset_in_bytes(T_LONG));