summaryrefslogtreecommitdiffstats
path: root/oatdump
diff options
context:
space:
mode:
authorDragos Sbirlea <dragoss@google.com>2013-08-12 08:53:04 -0700
committerDragos Sbirlea <dragoss@google.com>2013-08-13 10:09:48 -0700
commit08bf1967611965b65ffd5de1aa603b60e7b2d6a8 (patch)
treea9272c3a767cee878fdad81207bd8037f08dd830 /oatdump
parent73a79074c06d8b0a8c14946438c59c3821d88fe7 (diff)
downloadart-08bf1967611965b65ffd5de1aa603b60e7b2d6a8.zip
art-08bf1967611965b65ffd5de1aa603b60e7b2d6a8.tar.gz
art-08bf1967611965b65ffd5de1aa603b60e7b2d6a8.tar.bz2
Work on SMALL_ART and PORTABLE working at the same time.
Change-Id: Iddedf63b6f9d908717a4d30f963e9b81a9604d49
Diffstat (limited to 'oatdump')
-rw-r--r--oatdump/oatdump.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index a717f19..a6f295f 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -990,7 +990,9 @@ class ImageDumper {
DCHECK(method->GetNativeGcMap() == NULL) << PrettyMethod(method);
DCHECK(method->GetMappingTable() == NULL) << PrettyMethod(method);
} else {
- CHECK((method->GetEntryPointFromCompiledCode() == NULL) || (method->GetNativeGcMap() != NULL));
+ // TODO: we check there is a GC map here, we may not have a GC map if the code is pointing
+ // to the quick/portable to interpreter bridge.
+ CHECK(method->GetNativeGcMap() != NULL) << PrettyMethod(method);
const DexFile::CodeItem* code_item = MethodHelper(method).GetCodeItem();
size_t dex_instruction_bytes = code_item->insns_size_in_code_units_ * 2;