# HG changeset patch # User Thomas Wuerthinger # Date 1321455724 -3600 # Node ID 81ad8ab1f9fe5b0255014a8dfdca4c051586fe23 # Parent dea89750a867aef2aff3c53151ee4e9f271e8544 Remove ci usage on method lookup. diff -r dea89750a867 -r 81ad8ab1f9fe src/share/vm/graal/graalVMEntries.cpp --- a/src/share/vm/graal/graalVMEntries.cpp Wed Nov 16 16:00:11 2011 +0100 +++ b/src/share/vm/graal/graalVMEntries.cpp Wed Nov 16 16:02:04 2011 +0100 @@ -472,10 +472,8 @@ constantPoolHandle cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(type)))->constants(); Bytecodes::Code bc = (Bytecodes::Code) (((int) byteCode) & 0xFF); - ciInstanceKlass* loading_klass = (ciInstanceKlass *) CURRENT_ENV->get_object(cp->pool_holder()); - ciMethod *cimethod = CURRENT_ENV->get_method_by_index(cp, index, bc, loading_klass); - if (cimethod->is_loaded()) { - methodOop method = (methodOop) cimethod->get_oop(); + methodHandle method = GraalEnv::get_method_by_index(cp, index, bc, instanceKlass::cast(cp->pool_holder())); + if (!method.is_null()) { oop ret = GraalCompiler::createHotSpotMethodResolved(method, CHECK_NULL); return JNIHandles::make_local(THREAD, ret); } else {