diff options
| author | Carl Shapiro <cshapiro@google.com> | 2011-05-03 17:59:35 -0700 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2011-05-03 18:09:17 -0700 |
| commit | a62c3a0ab3fcdde37f47d16e9699a935ae7a8e88 (patch) | |
| tree | b23da5546e400facfa36b3dec6daac8c30d3a537 /vm/CheckJni.cpp | |
| parent | 00c88766d7425c7923187c18a8c7e91d32807a97 (diff) | |
Establish a subclass relationship between ArrayObject and Object.
Change-Id: I9f9fe52bd4ceebb6dde48251a89190ba6bb00ce4
Diffstat (limited to 'vm/CheckJni.cpp')
| -rw-r--r-- | vm/CheckJni.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/CheckJni.cpp b/vm/CheckJni.cpp index a891db9bb..a18bfd67f 100644 --- a/vm/CheckJni.cpp +++ b/vm/CheckJni.cpp @@ -1031,7 +1031,7 @@ static void* createGuardedPACopy(JNIEnv* env, const jarray jarr, jboolean* isCop ScopedJniThreadState ts(env); ArrayObject* arrObj = (ArrayObject*) dvmDecodeIndirectRef(env, jarr); - PrimitiveType primType = arrObj->obj.clazz->elementClass->primitiveType; + PrimitiveType primType = arrObj->clazz->elementClass->primitiveType; int len = arrObj->length * dvmPrimitiveTypeWidth(primType); void* result = GuardedCopy::create(arrObj->contents, len, true); if (isCopy != NULL) { @@ -1067,7 +1067,7 @@ static void* releaseGuardedPACopy(JNIEnv* env, jarray jarr, void* dataBuf, int m } /* pointer is to the array contents; back up to the array object */ - result -= offsetof(ArrayObject, contents); + result -= OFFSETOF_MEMBER(ArrayObject, contents); return result; } |