comparison src/share/vm/graal/graalCompilerToVM.cpp @ 6387:d44835610b52

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 13 Sep 2012 17:45:04 +0200
parents abeeb57b655d c61ce6bac1df
children 45f682f7fea8
comparison
equal deleted inserted replaced
6386:abeeb57b655d 6387:d44835610b52
863 863
864 C2V_VMENTRY(jint, JavaMethod_vtableEntryOffset, (JNIEnv *, jobject, jobject hotspot_method)) 864 C2V_VMENTRY(jint, JavaMethod_vtableEntryOffset, (JNIEnv *, jobject, jobject hotspot_method))
865 865
866 methodOop method = getMethodFromHotSpotMethod(hotspot_method); 866 methodOop method = getMethodFromHotSpotMethod(hotspot_method);
867 assert(!instanceKlass::cast(method->method_holder())->is_interface(), "vtableEntryOffset cannot be called for interface methods"); 867 assert(!instanceKlass::cast(method->method_holder())->is_interface(), "vtableEntryOffset cannot be called for interface methods");
868 assert(instanceKlass::cast(method->method_holder())->is_linked(), "vtableEntryOffset cannot be called is holder is not linked");
868 869
869 // get entry offset in words 870 // get entry offset in words
870 int vtable_entry_offset = instanceKlass::vtable_start_offset() + method->vtable_index() * vtableEntry::size(); 871 int vtable_entry_offset = instanceKlass::vtable_start_offset() + method->vtable_index() * vtableEntry::size();
871 // convert to bytes 872 // convert to bytes
872 vtable_entry_offset = vtable_entry_offset * wordSize + vtableEntry::method_offset_in_bytes(); 873 vtable_entry_offset = vtable_entry_offset * wordSize + vtableEntry::method_offset_in_bytes();