From bcd9dd7d1223eaa60f188d1a109d26e5e0143e10 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 7 Mar 2016 10:25:04 -0800 Subject: Don't use ScopedObjectAccess in Heap::DumpSpaces ScopedObjectAccess does not work well if the mutator lock is excusively held while in a suspend thread state. This caused deadlocks and DCHECK failures. Bug: 27493316 (cherry picked from commit 03d21bc5bed887243ff6ce3531179185ffd3532c) Change-Id: I5d67f74fc7082761e45dc1d7778b0ea7fceaaf8f --- compiler/image_writer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/image_writer.h') diff --git a/compiler/image_writer.h b/compiler/image_writer.h index dba9dd71fc..f204b28380 100644 --- a/compiler/image_writer.h +++ b/compiler/image_writer.h @@ -443,7 +443,7 @@ class ImageWriter FINAL { static Bin BinTypeForNativeRelocationType(NativeObjectRelocationType type); - uintptr_t NativeOffsetInImage(void* obj); + uintptr_t NativeOffsetInImage(void* obj) SHARED_REQUIRES(Locks::mutator_lock_); // Location of where the object will be when the image is loaded at runtime. template -- cgit v1.2.3-59-g8ed1b