diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-12-03 10:51:00 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-12-03 14:07:10 -0800 |
| commit | 85db144fbb79582b962344ca80068d91fac6e046 (patch) | |
| tree | 9559b734fff58474da26f4f2eee82022ef2946d3 /runtime/entrypoints/jni | |
| parent | 2f838d4058c091c56c31c5dfbc17d7379ba5523b (diff) | |
| download | art-85db144fbb79582b962344ca80068d91fac6e046.zip art-85db144fbb79582b962344ca80068d91fac6e046.tar.gz art-85db144fbb79582b962344ca80068d91fac6e046.tar.bz2 | |
Fix incorrect IsHeapAddress in jni entrypoints.
The behaviour of IsHeapAddress had changed in the compaction CL
to not include nullptr as a valid heap address.
Bug: 11982013
Change-Id: I2847f71ca6775210ea4de8ede8b9ee8c14c55228
Diffstat (limited to 'runtime/entrypoints/jni')
| -rw-r--r-- | runtime/entrypoints/jni/jni_entrypoints.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/entrypoints/jni/jni_entrypoints.cc b/runtime/entrypoints/jni/jni_entrypoints.cc index 16364fc..4d1e531 100644 --- a/runtime/entrypoints/jni/jni_entrypoints.cc +++ b/runtime/entrypoints/jni/jni_entrypoints.cc @@ -50,7 +50,7 @@ static void WorkAroundJniBugsForJobject(intptr_t* arg_ptr) { intptr_t value = *arg_ptr; mirror::Object** value_as_jni_rep = reinterpret_cast<mirror::Object**>(value); mirror::Object* value_as_work_around_rep = value_as_jni_rep != NULL ? *value_as_jni_rep : NULL; - CHECK(Runtime::Current()->GetHeap()->IsHeapAddress(value_as_work_around_rep)) + CHECK(Runtime::Current()->GetHeap()->IsValidObjectAddress(value_as_work_around_rep)) << value_as_work_around_rep; *arg_ptr = reinterpret_cast<intptr_t>(value_as_work_around_rep); } |