diff options
| author | Jeff Hao <jeffhao@google.com> | 2013-07-10 22:17:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-10 22:17:43 +0000 |
| commit | 5ece45186e4648ab38afbe86a71d8fff16bb1f57 (patch) | |
| tree | d27b1d9c45cd3e4a42f199da5eca30a8b6dfdc1b | |
| parent | 44d854dcd1404b858033eec1805ce61adc2e6a88 (diff) | |
| parent | cf90940b2f83f16f6a0ef3e9d9d911e11bb6c055 (diff) | |
| download | art-5ece45186e4648ab38afbe86a71d8fff16bb1f57.zip art-5ece45186e4648ab38afbe86a71d8fff16bb1f57.tar.gz art-5ece45186e4648ab38afbe86a71d8fff16bb1f57.tar.bz2 | |
Merge "Fix debug build assertion failing on boot." into dalvik-dev
| -rw-r--r-- | src/gc/space/space-inl.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gc/space/space-inl.h b/src/gc/space/space-inl.h index 8216d1b..54bf604 100644 --- a/src/gc/space/space-inl.h +++ b/src/gc/space/space-inl.h @@ -32,12 +32,7 @@ inline ImageSpace* Space::AsImageSpace() { } inline DlMallocSpace* Space::AsDlMallocSpace() { - DCHECK_EQ(GetType(), kSpaceTypeAllocSpace); - return down_cast<DlMallocSpace*>(down_cast<MemMapSpace*>(this)); -} - -inline DlMallocSpace* Space::AsZygoteSpace() { - DCHECK_EQ(GetType(), kSpaceTypeZygoteSpace); + DCHECK(GetType() == kSpaceTypeAllocSpace || GetType() == kSpaceTypeZygoteSpace); return down_cast<DlMallocSpace*>(down_cast<MemMapSpace*>(this)); } |