Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index 4b09a17f775f9718f53933420e2b55ae685936e7..39e0d0933c52bcb0681d0e91380771cdccfda79b 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -2024,10 +2024,16 @@ LInstruction* LChunkBuilder::DoCheckFunction(HCheckFunction* instr) { |
LInstruction* LChunkBuilder::DoCheckMaps(HCheckMaps* instr) { |
LOperand* value = NULL; |
- if (!instr->CanOmitMapChecks()) value = UseRegisterAtStart(instr->value()); |
- LInstruction* result = new(zone()) LCheckMaps(value); |
- if (instr->CanOmitMapChecks()) return result; |
- return AssignEnvironment(result); |
+ if (!instr->CanOmitMapChecks()) { |
+ value = UseRegisterAtStart(instr->value()); |
+ if (instr->has_migration_target()) info()->MarkAsDeferredCalling(); |
+ } |
+ LCheckMaps* result = new(zone()) LCheckMaps(value); |
+ if (!instr->CanOmitMapChecks()) { |
+ AssignEnvironment(result); |
+ if (instr->has_migration_target()) return AssignPointerMap(result); |
+ } |
+ return result; |
} |