From 85db144fbb79582b962344ca80068d91fac6e046 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 3 Dec 2013 10:51:00 -0800 Subject: 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 --- runtime/entrypoints/jni/jni_entrypoints.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/entrypoints/jni') 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(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(value_as_work_around_rep); } -- cgit v1.1