Index: src/ia32/lithium-ia32.cc |
diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc |
index 25867adb4668efa7bfaf3e07ab912ead9b5353b1..b390a9ff87b1dcd30306cba21ccd019027eb3d84 100644 |
--- a/src/ia32/lithium-ia32.cc |
+++ b/src/ia32/lithium-ia32.cc |
@@ -2061,11 +2061,21 @@ LInstruction* LChunkBuilder::DoCheckFunction(HCheckFunction* instr) { |
LInstruction* LChunkBuilder::DoCheckMaps(HCheckMaps* instr) { |
+ LOperand* context = NULL; |
LOperand* value = NULL; |
- if (!instr->CanOmitMapChecks()) value = UseRegisterAtStart(instr->value()); |
- LCheckMaps* 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()) { |
+ context = UseAny(instr->context()); |
+ info()->MarkAsDeferredCalling(); |
+ } |
+ } |
+ LCheckMaps* result = new(zone()) LCheckMaps(context, value); |
+ if (!instr->CanOmitMapChecks()) { |
+ AssignEnvironment(result); |
+ if (instr->has_migration_target()) return AssignPointerMap(result); |
+ } |
+ return result; |
} |