Mercurial > hg > graal-compiler
diff src/share/vm/prims/jni.cpp @ 3938:e6b1331a51d2
7086585: make Java field injection more flexible
Reviewed-by: jrose, twisti, kvn, coleenp
| author | never |
|---|---|
| date | Sat, 10 Sep 2011 17:29:02 -0700 |
| parents | 8a4fc2990229 |
| children | f08d439fab8c |
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp Sat Sep 10 00:11:04 2011 -0700 +++ b/src/share/vm/prims/jni.cpp Sat Sep 10 17:29:02 2011 -0700 @@ -492,7 +492,7 @@ // First check if this is a static field if (modifiers & JVM_ACC_STATIC) { - intptr_t offset = instanceKlass::cast(k1())->offset_from_fields( slot ); + intptr_t offset = instanceKlass::cast(k1())->field_offset( slot ); JNIid* id = instanceKlass::cast(k1())->jni_id_for(offset); assert(id != NULL, "corrupt Field object"); debug_only(id->set_is_static_field_id();) @@ -504,7 +504,7 @@ // The slot is the index of the field description in the field-array // The jfieldID is the offset of the field within the object // It may also have hash bits for k, if VerifyJNIFields is turned on. - intptr_t offset = instanceKlass::cast(k1())->offset_from_fields( slot ); + intptr_t offset = instanceKlass::cast(k1())->field_offset( slot ); assert(instanceKlass::cast(k1())->contains_field_offset(offset), "stay within object"); ret = jfieldIDWorkaround::to_instance_jfieldID(k1(), offset); return ret;