commit d4ac767281d3d4f6c420d5d41ed9dddf0c62606b
author Nicolas Geoffray <ngeoffray@google.com> Thu Apr 20 12:50:13 2017 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Thu Apr 20 13:13:44 2017 +0100
tree 1d847fc64884139e49948c6b704d8c3d5dd34e2e
parent 8d0f3aaf28358697ec812955cdf975ca6c6ff901

Fix fault_handler with heap poisoning.

test: test-art-host
Change-Id: Ifeb3d5ff4cfdcb703d5874bca90c9c1438d86f08

runtime/fault_handler.cc

diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc
index a200948..7f738bf 100644
--- a/runtime/fault_handler.cc
+++ b/runtime/fault_handler.cc
@@ -79,7 +79,8 @@
 static mirror::Class* SafeGetClass(mirror::Object* obj) REQUIRES_SHARED(Locks::mutator_lock_) {
   char* obj_cls = reinterpret_cast<char*>(obj) + mirror::Object::ClassOffset().SizeValue();
 
-  mirror::CompressedReference<mirror::Class> cls;
+  mirror::HeapReference<mirror::Class> cls =
+      mirror::HeapReference<mirror::Class>::FromMirrorPtr(nullptr);
   ssize_t rc = SafeCopy(&cls, obj_cls, sizeof(cls));
   CHECK_NE(-1, rc);