Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index b582ef7e7e4e61f9edf2ac0015c0a76763075ad9..340ac379aabe9ea4c9c991bfb4e3f5a292617362 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -1655,8 +1655,8 @@ void MacroAssembler::CheckMap(Register obj, |
Register scratch, |
Handle<Map> map, |
Label* fail, |
- bool is_heap_object) { |
- if (!is_heap_object) { |
+ SmiCheckType smi_check_type) { |
+ if (smi_check_type == DO_SMI_CHECK) { |
JumpIfSmi(obj, fail); |
} |
ldr(scratch, FieldMemOperand(obj, HeapObject::kMapOffset)); |
@@ -1670,8 +1670,8 @@ void MacroAssembler::CheckMap(Register obj, |
Register scratch, |
Heap::RootListIndex index, |
Label* fail, |
- bool is_heap_object) { |
- if (!is_heap_object) { |
+ SmiCheckType smi_check_type) { |
+ if (smi_check_type == DO_SMI_CHECK) { |
JumpIfSmi(obj, fail); |
} |
ldr(scratch, FieldMemOperand(obj, HeapObject::kMapOffset)); |
@@ -2521,7 +2521,7 @@ void MacroAssembler::LoadGlobalFunctionInitialMap(Register function, |
ldr(map, FieldMemOperand(function, JSFunction::kPrototypeOrInitialMapOffset)); |
if (emit_debug_code()) { |
Label ok, fail; |
- CheckMap(map, scratch, Heap::kMetaMapRootIndex, &fail, false); |
+ CheckMap(map, scratch, Heap::kMetaMapRootIndex, &fail, DO_SMI_CHECK); |
b(&ok); |
bind(&fail); |
Abort("Global functions must have initial map"); |