| Index: src/full-codegen/ia32/full-codegen-ia32.cc
|
| diff --git a/src/full-codegen/ia32/full-codegen-ia32.cc b/src/full-codegen/ia32/full-codegen-ia32.cc
|
| index a8c24520b666898c2d3da657bfb9fb2c78e5ae25..b408a4850cef1cf74fc5b61bc050834845ba002e 100644
|
| --- a/src/full-codegen/ia32/full-codegen-ia32.cc
|
| +++ b/src/full-codegen/ia32/full-codegen-ia32.cc
|
| @@ -168,8 +168,7 @@
|
| __ push(edi);
|
| __ Push(info->scope()->GetScopeInfo(info->isolate()));
|
| __ CallRuntime(Runtime::kNewScriptContext);
|
| - PrepareForBailoutForId(BailoutId::ScriptContext(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(BailoutId::ScriptContext(), TOS_REG);
|
| // The new target value is not used, clobbering is safe.
|
| DCHECK_NULL(info->scope()->new_target_var());
|
| } else {
|
| @@ -228,8 +227,7 @@
|
| // Register holding this function and new target are both trashed in case we
|
| // bailout here. But since that can happen only when new target is not used
|
| // and we allocate a context, the value of |function_in_register| is correct.
|
| - PrepareForBailoutForId(BailoutId::FunctionContext(),
|
| - BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(BailoutId::FunctionContext(), NO_REGISTERS);
|
|
|
| // Possibly set up a local binding to the this function which is used in
|
| // derived constructors with super calls.
|
| @@ -291,8 +289,7 @@
|
| }
|
|
|
| // Visit the declarations and body.
|
| - PrepareForBailoutForId(BailoutId::FunctionEntry(),
|
| - BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
|
| {
|
| Comment cmnt(masm_, "[ Declarations");
|
| VisitDeclarations(scope()->declarations());
|
| @@ -305,8 +302,7 @@
|
|
|
| {
|
| Comment cmnt(masm_, "[ Stack check");
|
| - PrepareForBailoutForId(BailoutId::Declarations(),
|
| - BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(BailoutId::Declarations(), NO_REGISTERS);
|
| Label ok;
|
| ExternalReference stack_limit =
|
| ExternalReference::address_of_stack_limit(isolate());
|
| @@ -373,11 +369,11 @@
|
| EmitProfilingCounterReset();
|
|
|
| __ bind(&ok);
|
| - PrepareForBailoutForId(stmt->EntryId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(stmt->EntryId(), NO_REGISTERS);
|
| // Record a mapping of the OSR id to this PC. This is used if the OSR
|
| // entry becomes the target of a bailout. We don't expect it to be, but
|
| // we want it to work if it is.
|
| - PrepareForBailoutForId(stmt->OsrEntryId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(stmt->OsrEntryId(), NO_REGISTERS);
|
| }
|
|
|
| void FullCodeGenerator::EmitProfilingCounterHandlingForReturnSequence(
|
| @@ -684,7 +680,7 @@
|
|
|
| Label skip;
|
| if (should_normalize) __ jmp(&skip, Label::kNear);
|
| - PrepareForBailout(expr, BailoutState::TOS_REGISTER);
|
| + PrepareForBailout(expr, TOS_REG);
|
| if (should_normalize) {
|
| __ cmp(eax, isolate()->factory()->true_value());
|
| Split(equal, if_true, if_false, NULL);
|
| @@ -740,7 +736,7 @@
|
| __ mov(ContextOperand(esi, variable->index()),
|
| Immediate(isolate()->factory()->the_hole_value()));
|
| // No write barrier since the hole value is in old space.
|
| - PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(proxy->id(), NO_REGISTERS);
|
| }
|
| break;
|
|
|
| @@ -761,7 +757,7 @@
|
| __ push(
|
| Immediate(Smi::FromInt(variable->DeclarationPropertyAttributes())));
|
| __ CallRuntime(Runtime::kDeclareLookupSlot);
|
| - PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(proxy->id(), NO_REGISTERS);
|
| break;
|
| }
|
| }
|
| @@ -805,7 +801,7 @@
|
| kDontSaveFPRegs,
|
| EMIT_REMEMBERED_SET,
|
| OMIT_SMI_CHECK);
|
| - PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(proxy->id(), NO_REGISTERS);
|
| break;
|
| }
|
|
|
| @@ -815,7 +811,7 @@
|
| VisitForStackValue(declaration->fun());
|
| PushOperand(Smi::FromInt(variable->DeclarationPropertyAttributes()));
|
| CallRuntimeWithOperands(Runtime::kDeclareLookupSlot);
|
| - PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(proxy->id(), NO_REGISTERS);
|
| break;
|
| }
|
| }
|
| @@ -846,7 +842,7 @@
|
|
|
| // Keep the switch value on the stack until a case matches.
|
| VisitForStackValue(stmt->tag());
|
| - PrepareForBailoutForId(stmt->EntryId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(stmt->EntryId(), NO_REGISTERS);
|
|
|
| ZoneList<CaseClause*>* clauses = stmt->cases();
|
| CaseClause* default_clause = NULL; // Can occur anywhere in the list.
|
| @@ -895,7 +891,7 @@
|
|
|
| Label skip;
|
| __ jmp(&skip, Label::kNear);
|
| - PrepareForBailout(clause, BailoutState::TOS_REGISTER);
|
| + PrepareForBailout(clause, TOS_REG);
|
| __ cmp(eax, isolate()->factory()->true_value());
|
| __ j(not_equal, &next_test);
|
| __ Drop(1);
|
| @@ -923,12 +919,12 @@
|
| Comment cmnt(masm_, "[ Case body");
|
| CaseClause* clause = clauses->at(i);
|
| __ bind(clause->body_target());
|
| - PrepareForBailoutForId(clause->EntryId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(clause->EntryId(), NO_REGISTERS);
|
| VisitStatements(clause->statements());
|
| }
|
|
|
| __ bind(nested_statement.break_label());
|
| - PrepareForBailoutForId(stmt->ExitId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(stmt->ExitId(), NO_REGISTERS);
|
| }
|
|
|
|
|
| @@ -961,7 +957,7 @@
|
| ToObjectStub stub(isolate());
|
| __ CallStub(&stub);
|
| __ bind(&done_convert);
|
| - PrepareForBailoutForId(stmt->ToObjectId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(stmt->ToObjectId(), TOS_REG);
|
| __ push(eax);
|
|
|
| // Check cache validity in generated code. If we cannot guarantee cache
|
| @@ -978,7 +974,7 @@
|
| __ bind(&call_runtime);
|
| __ push(eax);
|
| __ CallRuntime(Runtime::kForInEnumerate);
|
| - PrepareForBailoutForId(stmt->EnumId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(stmt->EnumId(), TOS_REG);
|
| __ cmp(FieldOperand(eax, HeapObject::kMapOffset),
|
| isolate()->factory()->meta_map());
|
| __ j(not_equal, &fixed_array);
|
| @@ -1014,7 +1010,7 @@
|
| __ push(eax); // Array
|
| __ mov(eax, FieldOperand(eax, FixedArray::kLengthOffset));
|
| __ push(eax); // Fixed array length (as smi).
|
| - PrepareForBailoutForId(stmt->PrepareId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(stmt->PrepareId(), NO_REGISTERS);
|
| __ push(Immediate(Smi::FromInt(0))); // Initial index.
|
|
|
| // Generate code for doing the condition check.
|
| @@ -1052,7 +1048,7 @@
|
| __ push(ecx); // Enumerable.
|
| __ push(ebx); // Current entry.
|
| __ CallRuntime(Runtime::kForInFilter);
|
| - PrepareForBailoutForId(stmt->FilterId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(stmt->FilterId(), TOS_REG);
|
| __ cmp(eax, isolate()->factory()->undefined_value());
|
| __ j(equal, loop_statement.continue_label());
|
| __ mov(ebx, eax);
|
| @@ -1064,11 +1060,11 @@
|
| // Perform the assignment as if via '='.
|
| { EffectContext context(this);
|
| EmitAssignment(stmt->each(), stmt->EachFeedbackSlot());
|
| - PrepareForBailoutForId(stmt->AssignmentId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(stmt->AssignmentId(), NO_REGISTERS);
|
| }
|
|
|
| // Both Crankshaft and Turbofan expect BodyId to be right before stmt->body().
|
| - PrepareForBailoutForId(stmt->BodyId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(stmt->BodyId(), NO_REGISTERS);
|
| // Generate code for the body of the loop.
|
| Visit(stmt->body());
|
|
|
| @@ -1085,7 +1081,7 @@
|
| DropOperands(5);
|
|
|
| // Exit and decrement the loop depth.
|
| - PrepareForBailoutForId(stmt->ExitId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(stmt->ExitId(), NO_REGISTERS);
|
| __ bind(&exit);
|
| decrement_loop_depth();
|
| }
|
| @@ -1243,7 +1239,7 @@
|
| void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy,
|
| TypeofMode typeof_mode) {
|
| SetExpressionPosition(proxy);
|
| - PrepareForBailoutForId(proxy->BeforeId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(proxy->BeforeId(), NO_REGISTERS);
|
| Variable* var = proxy->var();
|
|
|
| // Three cases: global variables, lookup variables, and all other types of
|
| @@ -1355,7 +1351,7 @@
|
| __ CallStub(&stub);
|
| RestoreContext();
|
| }
|
| - PrepareForBailoutForId(expr->CreateLiteralId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->CreateLiteralId(), TOS_REG);
|
|
|
| // If result_saved is true the result is on top of the stack. If
|
| // result_saved is false the result is in eax.
|
| @@ -1391,7 +1387,7 @@
|
| __ mov(StoreDescriptor::ReceiverRegister(), Operand(esp, 0));
|
| EmitLoadStoreICSlot(property->GetSlot(0));
|
| CallStoreIC();
|
| - PrepareForBailoutForId(key->id(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(key->id(), NO_REGISTERS);
|
| if (NeedsHomeObject(value)) {
|
| EmitSetHomeObjectAccumulator(value, 0, property->GetSlot(1));
|
| }
|
| @@ -1419,7 +1415,7 @@
|
| DCHECK(property->emit_store());
|
| CallRuntimeWithOperands(Runtime::kInternalSetPrototype);
|
| PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
|
| - BailoutState::NO_REGISTERS);
|
| + NO_REGISTERS);
|
| break;
|
| case ObjectLiteral::Property::GETTER:
|
| if (property->emit_store()) {
|
| @@ -1475,7 +1471,7 @@
|
| DCHECK(property->emit_store());
|
| CallRuntimeWithOperands(Runtime::kInternalSetPrototype);
|
| PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),
|
| - BailoutState::NO_REGISTERS);
|
| + NO_REGISTERS);
|
| } else {
|
| EmitPropertyKey(property, expr->GetIdForPropertyName(property_index));
|
| VisitForStackValue(value);
|
| @@ -1548,7 +1544,7 @@
|
| FastCloneShallowArrayStub stub(isolate(), allocation_site_mode);
|
| __ CallStub(&stub);
|
| }
|
| - PrepareForBailoutForId(expr->CreateLiteralId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->CreateLiteralId(), TOS_REG);
|
|
|
| bool result_saved = false; // Is the result saved to the stack?
|
| ZoneList<Expression*>* subexprs = expr->values();
|
| @@ -1578,8 +1574,7 @@
|
| Handle<Code> ic =
|
| CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
|
| CallIC(ic);
|
| - PrepareForBailoutForId(expr->GetIdForElement(array_index),
|
| - BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS);
|
| }
|
|
|
| // In case the array literal contains spread expressions it has two parts. The
|
| @@ -1599,8 +1594,7 @@
|
| VisitForStackValue(subexpr);
|
| CallRuntimeWithOperands(Runtime::kAppendElement);
|
|
|
| - PrepareForBailoutForId(expr->GetIdForElement(array_index),
|
| - BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS);
|
| }
|
|
|
| if (result_saved) {
|
| @@ -1679,27 +1673,23 @@
|
| switch (assign_type) {
|
| case VARIABLE:
|
| EmitVariableLoad(expr->target()->AsVariableProxy());
|
| - PrepareForBailout(expr->target(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailout(expr->target(), TOS_REG);
|
| break;
|
| case NAMED_SUPER_PROPERTY:
|
| EmitNamedSuperPropertyLoad(property);
|
| - PrepareForBailoutForId(property->LoadId(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(property->LoadId(), TOS_REG);
|
| break;
|
| case NAMED_PROPERTY:
|
| EmitNamedPropertyLoad(property);
|
| - PrepareForBailoutForId(property->LoadId(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(property->LoadId(), TOS_REG);
|
| break;
|
| case KEYED_SUPER_PROPERTY:
|
| EmitKeyedSuperPropertyLoad(property);
|
| - PrepareForBailoutForId(property->LoadId(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(property->LoadId(), TOS_REG);
|
| break;
|
| case KEYED_PROPERTY:
|
| EmitKeyedPropertyLoad(property);
|
| - PrepareForBailoutForId(property->LoadId(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(property->LoadId(), TOS_REG);
|
| break;
|
| }
|
| }
|
| @@ -1718,7 +1708,7 @@
|
| }
|
|
|
| // Deoptimization point in case the binary operation may have side effects.
|
| - PrepareForBailout(expr->binary_operation(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailout(expr->binary_operation(), TOS_REG);
|
| } else {
|
| VisitForAccumulatorValue(expr->value());
|
| }
|
| @@ -1730,7 +1720,7 @@
|
| case VARIABLE:
|
| EmitVariableAssignment(expr->target()->AsVariableProxy()->var(),
|
| expr->op(), expr->AssignmentSlot());
|
| - PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| context()->Plug(eax);
|
| break;
|
| case NAMED_PROPERTY:
|
| @@ -2189,7 +2179,7 @@
|
| PopOperand(StoreDescriptor::ReceiverRegister());
|
| EmitLoadStoreICSlot(expr->AssignmentSlot());
|
| CallStoreIC();
|
| - PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| context()->Plug(eax);
|
| }
|
|
|
| @@ -2235,7 +2225,7 @@
|
| CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
|
| EmitLoadStoreICSlot(expr->AssignmentSlot());
|
| CallIC(ic);
|
| - PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| context()->Plug(eax);
|
| }
|
|
|
| @@ -2256,7 +2246,7 @@
|
| if (callee->IsVariableProxy()) {
|
| { StackValueContext context(this);
|
| EmitVariableLoad(callee->AsVariableProxy());
|
| - PrepareForBailout(callee, BailoutState::NO_REGISTERS);
|
| + PrepareForBailout(callee, NO_REGISTERS);
|
| }
|
| // Push undefined as receiver. This is patched in the method prologue if it
|
| // is a sloppy mode method.
|
| @@ -2268,8 +2258,7 @@
|
| DCHECK(!callee->AsProperty()->IsSuperAccess());
|
| __ mov(LoadDescriptor::ReceiverRegister(), Operand(esp, 0));
|
| EmitNamedPropertyLoad(callee->AsProperty());
|
| - PrepareForBailoutForId(callee->AsProperty()->LoadId(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG);
|
| // Push the target function under the receiver.
|
| PushOperand(Operand(esp, 0));
|
| __ mov(Operand(esp, kPointerSize), eax);
|
| @@ -2304,7 +2293,7 @@
|
| // - home_object
|
| // - key
|
| CallRuntimeWithOperands(Runtime::kLoadFromSuper);
|
| - PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(prop->LoadId(), TOS_REG);
|
|
|
| // Replace home_object with target function.
|
| __ mov(Operand(esp, kPointerSize), eax);
|
| @@ -2329,8 +2318,7 @@
|
| __ mov(LoadDescriptor::ReceiverRegister(), Operand(esp, 0));
|
| __ mov(LoadDescriptor::NameRegister(), eax);
|
| EmitKeyedPropertyLoad(callee->AsProperty());
|
| - PrepareForBailoutForId(callee->AsProperty()->LoadId(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG);
|
|
|
| // Push the target function under the receiver.
|
| PushOperand(Operand(esp, 0));
|
| @@ -2362,7 +2350,7 @@
|
| // - home_object
|
| // - key
|
| CallRuntimeWithOperands(Runtime::kLoadKeyedFromSuper);
|
| - PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(prop->LoadId(), TOS_REG);
|
|
|
| // Replace home_object with target function.
|
| __ mov(Operand(esp, kPointerSize), eax);
|
| @@ -2382,7 +2370,7 @@
|
| VisitForStackValue(args->at(i));
|
| }
|
|
|
| - PrepareForBailoutForId(expr->CallId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(expr->CallId(), NO_REGISTERS);
|
| SetCallPosition(expr, expr->tail_call_mode());
|
| if (expr->tail_call_mode() == TailCallMode::kAllow) {
|
| if (FLAG_trace) {
|
| @@ -2450,7 +2438,7 @@
|
| __ CallRuntime(Runtime::kLoadLookupSlotForCall);
|
| PushOperand(eax); // Function.
|
| PushOperand(edx); // Receiver.
|
| - PrepareForBailoutForId(expr->LookupId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(expr->LookupId(), NO_REGISTERS);
|
|
|
| // If fast case code has been generated, emit code to push the function
|
| // and receiver and have the slow path jump around this code.
|
| @@ -2495,7 +2483,7 @@
|
| // Touch up the stack with the resolved function.
|
| __ mov(Operand(esp, (arg_count + 1) * kPointerSize), eax);
|
|
|
| - PrepareForBailoutForId(expr->EvalId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(expr->EvalId(), NO_REGISTERS);
|
|
|
| SetCallPosition(expr);
|
| __ mov(edi, Operand(esp, (arg_count + 1) * kPointerSize));
|
| @@ -2544,7 +2532,7 @@
|
| CallConstructStub stub(isolate());
|
| __ call(stub.GetCode(), RelocInfo::CODE_TARGET);
|
| OperandStackDepthDecrement(arg_count + 1);
|
| - PrepareForBailoutForId(expr->ReturnId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->ReturnId(), TOS_REG);
|
| RestoreContext();
|
| context()->Plug(eax);
|
| }
|
| @@ -2979,7 +2967,7 @@
|
| for (Expression* const arg : *args) {
|
| VisitForStackValue(arg);
|
| }
|
| - PrepareForBailoutForId(expr->CallId(), BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(expr->CallId(), NO_REGISTERS);
|
| // Move target to edi.
|
| int const argc = args->length() - 2;
|
| __ mov(edi, Operand(esp, (argc + 1) * kPointerSize));
|
| @@ -3193,8 +3181,7 @@
|
| &materialize_true);
|
| if (!context()->IsAccumulatorValue()) OperandStackDepthIncrement(1);
|
| __ bind(&materialize_true);
|
| - PrepareForBailoutForId(expr->MaterializeTrueId(),
|
| - BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(expr->MaterializeTrueId(), NO_REGISTERS);
|
| if (context()->IsAccumulatorValue()) {
|
| __ mov(eax, isolate()->factory()->true_value());
|
| } else {
|
| @@ -3202,8 +3189,7 @@
|
| }
|
| __ jmp(&done, Label::kNear);
|
| __ bind(&materialize_false);
|
| - PrepareForBailoutForId(expr->MaterializeFalseId(),
|
| - BailoutState::NO_REGISTERS);
|
| + PrepareForBailoutForId(expr->MaterializeFalseId(), NO_REGISTERS);
|
| if (context()->IsAccumulatorValue()) {
|
| __ mov(eax, isolate()->factory()->false_value());
|
| } else {
|
| @@ -3302,9 +3288,9 @@
|
| // We need a second deoptimization point after loading the value
|
| // in case evaluating the property load my have a side effect.
|
| if (assign_type == VARIABLE) {
|
| - PrepareForBailout(expr->expression(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailout(expr->expression(), TOS_REG);
|
| } else {
|
| - PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(prop->LoadId(), TOS_REG);
|
| }
|
|
|
| // Inline smi case if we are in a loop.
|
| @@ -3359,7 +3345,7 @@
|
| // Convert old value into a number.
|
| ToNumberStub convert_stub(isolate());
|
| __ CallStub(&convert_stub);
|
| - PrepareForBailoutForId(expr->ToNumberId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->ToNumberId(), TOS_REG);
|
|
|
| // Save result for postfix expressions.
|
| if (expr->is_postfix()) {
|
| @@ -3407,8 +3393,7 @@
|
| { EffectContext context(this);
|
| EmitVariableAssignment(expr->expression()->AsVariableProxy()->var(),
|
| Token::ASSIGN, expr->CountSlot());
|
| - PrepareForBailoutForId(expr->AssignmentId(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| context.Plug(eax);
|
| }
|
| // For all contexts except EffectContext We have the result on
|
| @@ -3420,8 +3405,7 @@
|
| // Perform the assignment as if via '='.
|
| EmitVariableAssignment(expr->expression()->AsVariableProxy()->var(),
|
| Token::ASSIGN, expr->CountSlot());
|
| - PrepareForBailoutForId(expr->AssignmentId(),
|
| - BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| context()->Plug(eax);
|
| }
|
| break;
|
| @@ -3431,7 +3415,7 @@
|
| PopOperand(StoreDescriptor::ReceiverRegister());
|
| EmitLoadStoreICSlot(expr->CountSlot());
|
| CallStoreIC();
|
| - PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| if (expr->is_postfix()) {
|
| if (!context()->IsEffect()) {
|
| context()->PlugTOS();
|
| @@ -3470,7 +3454,7 @@
|
| CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();
|
| EmitLoadStoreICSlot(expr->CountSlot());
|
| CallIC(ic);
|
| - PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);
|
| + PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);
|
| if (expr->is_postfix()) {
|
| // Result is on the stack
|
| if (!context()->IsEffect()) {
|
|
|