diff options
| author | 2016-03-07 10:25:04 -0800 | |
|---|---|---|
| committer | 2016-03-07 13:14:45 -0800 | |
| commit | bcd9dd7d1223eaa60f188d1a109d26e5e0143e10 (patch) | |
| tree | b9b121de21cbc0a97cf9138a6f66d3df4b1aee65 /compiler/image_writer.h | |
| parent | 810ef3768021b5fc7b47e663e037e49c46f8c916 (diff) | |
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
Diffstat (limited to 'compiler/image_writer.h')
| -rw-r--r-- | compiler/image_writer.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 <typename T> |