summaryrefslogtreecommitdiffstats
path: root/runtime/scoped_thread_state_change.h
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-05-04 11:46:25 -0700
committerMathieu Chartier <mathieuc@google.com>2015-05-04 12:05:09 -0700
commite1a0153eeecbacaa4dbdbd4650f7ba40b9c47814 (patch)
treef0128765411a81d8a4faaddda13a56aafb6ff9c0 /runtime/scoped_thread_state_change.h
parenta93b104b47da67eaa50f8a6b7280cc6c438ef37b (diff)
downloadart-e1a0153eeecbacaa4dbdbd4650f7ba40b9c47814.tar.gz
art-e1a0153eeecbacaa4dbdbd4650f7ba40b9c47814.tar.bz2
art-e1a0153eeecbacaa4dbdbd4650f7ba40b9c47814.zip
Delete invalid DCHECK
We can have large objects mapped at address 0xebad____. Change-Id: I9e27d4948e7e853b4af6eb1b36dbfec6d4d7a99a
Diffstat (limited to 'runtime/scoped_thread_state_change.h')
-rw-r--r--runtime/scoped_thread_state_change.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/runtime/scoped_thread_state_change.h b/runtime/scoped_thread_state_change.h
index b93fcb4322..99750a16d0 100644
--- a/runtime/scoped_thread_state_change.h
+++ b/runtime/scoped_thread_state_change.h
@@ -133,11 +133,7 @@ class ScopedObjectAccessAlreadyRunnable {
T AddLocalReference(mirror::Object* obj) const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
Locks::mutator_lock_->AssertSharedHeld(Self());
DCHECK(IsRunnable()); // Don't work with raw objects in non-runnable states.
- if (obj == nullptr) {
- return nullptr;
- }
- DCHECK_NE((reinterpret_cast<uintptr_t>(obj) & 0xffff0000), 0xebad0000);
- return Env()->AddLocalReference<T>(obj);
+ return obj == nullptr ? nullptr : Env()->AddLocalReference<T>(obj);
}
template<typename T>