commit ed1c1e335acc9f61c7e25a78204f159ee3d13350
author Elliott Hughes <enh@google.com> Sun Oct 02 14:31:05 2011 -0700
committer Elliott Hughes <enh@google.com> Sun Oct 02 14:31:05 2011 -0700
tree 91be0a05aaf7e18f655cad675e411ed56a79d48a
parent 67786519786755d287bcda07dceb6b6110b4f3f0

Fix field access.

There was a bug in the implementation where the native methods weren't
necessarily getting a null receiver but art::Object insists that you only
get/set static fields on a null receiver.

Also, these tests assume that fields are in the setAccessible(false) state
by default. In our system, they're not.

Change-Id: I935614fec013be465fc0bc30d3c717f12476e09b

src/java_lang_reflect_Field.cc

diff --git a/src/java_lang_reflect_Field.cc b/src/java_lang_reflect_Field.cc
index 8e09adb..2937241 100644
--- a/src/java_lang_reflect_Field.cc
+++ b/src/java_lang_reflect_Field.cc
@@ -71,17 +71,25 @@
   return false;
 }
 
+bool CheckReceiver(JNIEnv* env, jobject javaObj, jclass javaDeclaringClass, Field* f, Object*& o) {
+  if (f->IsStatic()) {
+    o = NULL;
+    return true;
+  }
+
+  o = Decode<Object*>(env, javaObj);
+  Class* declaringClass = Decode<Class*>(env, javaDeclaringClass);
+  if (!VerifyObjectInClass(env, o, declaringClass)) {
+    return false;
+  }
+  return true;
+}
+
 JValue GetPrimitiveField(JNIEnv* env, jobject javaField, jobject javaObj, jclass javaDeclaringClass, jchar targetDescriptor) {
   Field* f = DecodeField(env->FromReflectedField(javaField));
-
-  // Check that the receiver is non-null and an instance of the field's declaring class.
-  Object* o = Decode<Object*>(env, javaObj);
-  bool isStatic = (javaObj == NULL);
-  if (!isStatic) {
-    Class* declaringClass = Decode<Class*>(env, javaDeclaringClass);
-    if (!VerifyObjectInClass(env, o, declaringClass)) {
-      return JValue();
-    }
+  Object* o = NULL;
+  if (!CheckReceiver(env, javaObj, javaDeclaringClass, f, o)) {
+    return JValue();
   }
 
   // Read the value.
@@ -179,15 +187,9 @@
 
 void SetPrimitiveField(JNIEnv* env, jobject javaField, jobject javaObj, jclass javaDeclaringClass, jchar targetDescriptor, const JValue& new_value) {
   Field* f = DecodeField(env->FromReflectedField(javaField));
-
-  // Check that the receiver is non-null and an instance of the field's declaring class.
-  Object* o = Decode<Object*>(env, javaObj);
-  bool isStatic = (javaObj == NULL);
-  if (!isStatic) {
-    Class* declaringClass = Decode<Class*>(env, javaDeclaringClass);
-    if (!VerifyObjectInClass(env, o, declaringClass)) {
-      return;
-    }
+  Object* o = NULL;
+  if (!CheckReceiver(env, javaObj, javaDeclaringClass, f, o)) {
+    return;
   }
 
   // Widen the value if necessary (and possible).
@@ -260,13 +262,9 @@
   }
 
   // Check that the receiver is non-null and an instance of the field's declaring class.
-  Object* o = Decode<Object*>(env, javaObj);
-  bool isStatic = (javaObj == NULL);
-  if (!isStatic) {
-    Class* declaringClass = Decode<Class*>(env, javaDeclaringClass);
-    if (!VerifyObjectInClass(env, o, declaringClass)) {
-      return;
-    }
+  Object* o = NULL;
+  if (!CheckReceiver(env, javaObj, javaDeclaringClass, f, o)) {
+    return;
   }
 
   SetFieldValue(o, f, unboxed_value, true);
@@ -274,15 +272,9 @@
 
 jobject Field_getField(JNIEnv* env, jobject javaField, jobject javaObj, jclass javaDeclaringClass, jclass, jint, jboolean) {
   Field* f = DecodeField(env->FromReflectedField(javaField));
-
-  // Check that the receiver is non-null and an instance of the field's declaring class.
-  Object* o = Decode<Object*>(env, javaObj);
-  bool isStatic = (javaObj == NULL);
-  if (!isStatic) {
-    Class* declaringClass = Decode<Class*>(env, javaDeclaringClass);
-    if (!VerifyObjectInClass(env, o, declaringClass)) {
-      return NULL;
-    }
+  Object* o = NULL;
+  if (!CheckReceiver(env, javaObj, javaDeclaringClass, f, o)) {
+    return NULL;
   }
 
   // Get the field's value, boxing if necessary.