diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-16 23:50:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-16 23:43:15 +0000 |
| commit | 81457a3cd8fca14396b5785a4e4c8070c259b07a (patch) | |
| tree | af063dbc45f27290532e36cee34eb00c120b327e | |
| parent | 233b0e37b463ba3e880262f6fea255b95f0f89c1 (diff) | |
| parent | 22c6a817ed3019455d22df13bd91faf012177ef6 (diff) | |
| download | art-81457a3cd8fca14396b5785a4e4c8070c259b07a.zip art-81457a3cd8fca14396b5785a4e4c8070c259b07a.tar.gz art-81457a3cd8fca14396b5785a4e4c8070c259b07a.tar.bz2 | |
Merge "Add back a deleted check related to verification."
| -rw-r--r-- | runtime/gc/heap.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index ff7a188..4e38335 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -1145,6 +1145,10 @@ void Heap::DumpSpaces(std::ostream& stream) const { } void Heap::VerifyObjectBody(mirror::Object* obj) { + if (verify_object_mode_ == kVerifyObjectModeDisabled) { + return; + } + // Ignore early dawn of the universe verifications. if (UNLIKELY(static_cast<size_t>(num_bytes_allocated_.LoadRelaxed()) < 10 * KB)) { return; |