Index: src/full-codegen/x64/full-codegen-x64.cc |
diff --git a/src/full-codegen/x64/full-codegen-x64.cc b/src/full-codegen/x64/full-codegen-x64.cc |
index 74dbdf08ae5141d00101ca26403fa5f02ad7d8f7..a7eb7dd18e7acf930b335a0ad9451cce122eb1c5 100644 |
--- a/src/full-codegen/x64/full-codegen-x64.cc |
+++ b/src/full-codegen/x64/full-codegen-x64.cc |
@@ -166,7 +166,8 @@ void FullCodeGenerator::Generate() { |
__ Push(rdi); |
__ Push(info->scope()->GetScopeInfo(info->isolate())); |
__ CallRuntime(Runtime::kNewScriptContext); |
- PrepareForBailoutForId(BailoutId::ScriptContext(), TOS_REG); |
+ PrepareForBailoutForId(BailoutId::ScriptContext(), |
+ BailoutState::TOS_REGISTER); |
// The new target value is not used, clobbering is safe. |
DCHECK_NULL(info->scope()->new_target_var()); |
} else { |
@@ -222,7 +223,8 @@ void FullCodeGenerator::Generate() { |
// 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(), NO_REGISTERS); |
+ PrepareForBailoutForId(BailoutId::FunctionContext(), |
+ BailoutState::NO_REGISTERS); |
// Possibly set up a local binding to the this function which is used in |
// derived constructors with super calls. |
@@ -286,7 +288,8 @@ void FullCodeGenerator::Generate() { |
// Visit the declarations and body unless there is an illegal |
// redeclaration. |
- PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS); |
+ PrepareForBailoutForId(BailoutId::FunctionEntry(), |
+ BailoutState::NO_REGISTERS); |
{ |
Comment cmnt(masm_, "[ Declarations"); |
VisitDeclarations(scope()->declarations()); |
@@ -299,7 +302,8 @@ void FullCodeGenerator::Generate() { |
{ |
Comment cmnt(masm_, "[ Stack check"); |
- PrepareForBailoutForId(BailoutId::Declarations(), NO_REGISTERS); |
+ PrepareForBailoutForId(BailoutId::Declarations(), |
+ BailoutState::NO_REGISTERS); |
Label ok; |
__ CompareRoot(rsp, Heap::kStackLimitRootIndex); |
__ j(above_equal, &ok, Label::kNear); |
@@ -372,11 +376,11 @@ void FullCodeGenerator::EmitBackEdgeBookkeeping(IterationStatement* stmt, |
} |
__ bind(&ok); |
- PrepareForBailoutForId(stmt->EntryId(), NO_REGISTERS); |
+ PrepareForBailoutForId(stmt->EntryId(), BailoutState::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(), NO_REGISTERS); |
+ PrepareForBailoutForId(stmt->OsrEntryId(), BailoutState::NO_REGISTERS); |
} |
void FullCodeGenerator::EmitProfilingCounterHandlingForReturnSequence( |
@@ -692,7 +696,7 @@ void FullCodeGenerator::PrepareForBailoutBeforeSplit(Expression* expr, |
Label skip; |
if (should_normalize) __ jmp(&skip, Label::kNear); |
- PrepareForBailout(expr, TOS_REG); |
+ PrepareForBailout(expr, BailoutState::TOS_REGISTER); |
if (should_normalize) { |
__ CompareRoot(rax, Heap::kTrueValueRootIndex); |
Split(equal, if_true, if_false, NULL); |
@@ -748,7 +752,7 @@ void FullCodeGenerator::VisitVariableDeclaration( |
__ LoadRoot(kScratchRegister, Heap::kTheHoleValueRootIndex); |
__ movp(ContextOperand(rsi, variable->index()), kScratchRegister); |
// No write barrier since the hole value is in old space. |
- PrepareForBailoutForId(proxy->id(), NO_REGISTERS); |
+ PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS); |
} |
break; |
@@ -768,7 +772,7 @@ void FullCodeGenerator::VisitVariableDeclaration( |
} |
__ Push(Smi::FromInt(variable->DeclarationPropertyAttributes())); |
__ CallRuntime(Runtime::kDeclareLookupSlot); |
- PrepareForBailoutForId(proxy->id(), NO_REGISTERS); |
+ PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS); |
break; |
} |
} |
@@ -813,7 +817,7 @@ void FullCodeGenerator::VisitFunctionDeclaration( |
kDontSaveFPRegs, |
EMIT_REMEMBERED_SET, |
OMIT_SMI_CHECK); |
- PrepareForBailoutForId(proxy->id(), NO_REGISTERS); |
+ PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS); |
break; |
} |
@@ -823,7 +827,7 @@ void FullCodeGenerator::VisitFunctionDeclaration( |
VisitForStackValue(declaration->fun()); |
PushOperand(Smi::FromInt(variable->DeclarationPropertyAttributes())); |
CallRuntimeWithOperands(Runtime::kDeclareLookupSlot); |
- PrepareForBailoutForId(proxy->id(), NO_REGISTERS); |
+ PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS); |
break; |
} |
} |
@@ -854,7 +858,7 @@ void FullCodeGenerator::VisitSwitchStatement(SwitchStatement* stmt) { |
// Keep the switch value on the stack until a case matches. |
VisitForStackValue(stmt->tag()); |
- PrepareForBailoutForId(stmt->EntryId(), NO_REGISTERS); |
+ PrepareForBailoutForId(stmt->EntryId(), BailoutState::NO_REGISTERS); |
ZoneList<CaseClause*>* clauses = stmt->cases(); |
CaseClause* default_clause = NULL; // Can occur anywhere in the list. |
@@ -904,7 +908,7 @@ void FullCodeGenerator::VisitSwitchStatement(SwitchStatement* stmt) { |
Label skip; |
__ jmp(&skip, Label::kNear); |
- PrepareForBailout(clause, TOS_REG); |
+ PrepareForBailout(clause, BailoutState::TOS_REGISTER); |
__ CompareRoot(rax, Heap::kTrueValueRootIndex); |
__ j(not_equal, &next_test); |
__ Drop(1); |
@@ -932,12 +936,12 @@ void FullCodeGenerator::VisitSwitchStatement(SwitchStatement* stmt) { |
Comment cmnt(masm_, "[ Case body"); |
CaseClause* clause = clauses->at(i); |
__ bind(clause->body_target()); |
- PrepareForBailoutForId(clause->EntryId(), NO_REGISTERS); |
+ PrepareForBailoutForId(clause->EntryId(), BailoutState::NO_REGISTERS); |
VisitStatements(clause->statements()); |
} |
__ bind(nested_statement.break_label()); |
- PrepareForBailoutForId(stmt->ExitId(), NO_REGISTERS); |
+ PrepareForBailoutForId(stmt->ExitId(), BailoutState::NO_REGISTERS); |
} |
@@ -970,7 +974,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
ToObjectStub stub(isolate()); |
__ CallStub(&stub); |
__ bind(&done_convert); |
- PrepareForBailoutForId(stmt->ToObjectId(), TOS_REG); |
+ PrepareForBailoutForId(stmt->ToObjectId(), BailoutState::TOS_REGISTER); |
__ Push(rax); |
// Check cache validity in generated code. If we cannot guarantee cache |
@@ -990,7 +994,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
__ bind(&call_runtime); |
__ Push(rax); // Duplicate the enumerable object on the stack. |
__ CallRuntime(Runtime::kForInEnumerate); |
- PrepareForBailoutForId(stmt->EnumId(), TOS_REG); |
+ PrepareForBailoutForId(stmt->EnumId(), BailoutState::TOS_REGISTER); |
// If we got a map from the runtime call, we can do a fast |
// modification check. Otherwise, we got a fixed array, and we have |
@@ -1032,7 +1036,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
__ Push(rax); // Array |
__ movp(rax, FieldOperand(rax, FixedArray::kLengthOffset)); |
__ Push(rax); // Fixed array length (as smi). |
- PrepareForBailoutForId(stmt->PrepareId(), NO_REGISTERS); |
+ PrepareForBailoutForId(stmt->PrepareId(), BailoutState::NO_REGISTERS); |
__ Push(Smi::FromInt(0)); // Initial index. |
// Generate code for doing the condition check. |
@@ -1074,7 +1078,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
__ Push(rcx); // Enumerable. |
__ Push(rbx); // Current entry. |
__ CallRuntime(Runtime::kForInFilter); |
- PrepareForBailoutForId(stmt->FilterId(), TOS_REG); |
+ PrepareForBailoutForId(stmt->FilterId(), BailoutState::TOS_REGISTER); |
__ CompareRoot(rax, Heap::kUndefinedValueRootIndex); |
__ j(equal, loop_statement.continue_label()); |
__ movp(rbx, rax); |
@@ -1086,11 +1090,11 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
// Perform the assignment as if via '='. |
{ EffectContext context(this); |
EmitAssignment(stmt->each(), stmt->EachFeedbackSlot()); |
- PrepareForBailoutForId(stmt->AssignmentId(), NO_REGISTERS); |
+ PrepareForBailoutForId(stmt->AssignmentId(), BailoutState::NO_REGISTERS); |
} |
// Both Crankshaft and Turbofan expect BodyId to be right before stmt->body(). |
- PrepareForBailoutForId(stmt->BodyId(), NO_REGISTERS); |
+ PrepareForBailoutForId(stmt->BodyId(), BailoutState::NO_REGISTERS); |
// Generate code for the body of the loop. |
Visit(stmt->body()); |
@@ -1107,7 +1111,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
DropOperands(5); |
// Exit and decrement the loop depth. |
- PrepareForBailoutForId(stmt->ExitId(), NO_REGISTERS); |
+ PrepareForBailoutForId(stmt->ExitId(), BailoutState::NO_REGISTERS); |
__ bind(&exit); |
decrement_loop_depth(); |
} |
@@ -1266,7 +1270,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy, |
TypeofMode typeof_mode) { |
// Record position before possible IC call. |
SetExpressionPosition(proxy); |
- PrepareForBailoutForId(proxy->BeforeId(), NO_REGISTERS); |
+ PrepareForBailoutForId(proxy->BeforeId(), BailoutState::NO_REGISTERS); |
Variable* var = proxy->var(); |
// Three cases: global variables, lookup variables, and all other types of |
@@ -1376,7 +1380,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
__ CallStub(&stub); |
RestoreContext(); |
} |
- PrepareForBailoutForId(expr->CreateLiteralId(), TOS_REG); |
+ PrepareForBailoutForId(expr->CreateLiteralId(), BailoutState::TOS_REGISTER); |
// If result_saved is true the result is on top of the stack. If |
// result_saved is false the result is in rax. |
@@ -1412,7 +1416,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
__ movp(StoreDescriptor::ReceiverRegister(), Operand(rsp, 0)); |
EmitLoadStoreICSlot(property->GetSlot(0)); |
CallStoreIC(); |
- PrepareForBailoutForId(key->id(), NO_REGISTERS); |
+ PrepareForBailoutForId(key->id(), BailoutState::NO_REGISTERS); |
if (NeedsHomeObject(value)) { |
EmitSetHomeObjectAccumulator(value, 0, property->GetSlot(1)); |
@@ -1441,7 +1445,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
DCHECK(property->emit_store()); |
CallRuntimeWithOperands(Runtime::kInternalSetPrototype); |
PrepareForBailoutForId(expr->GetIdForPropertySet(property_index), |
- NO_REGISTERS); |
+ BailoutState::NO_REGISTERS); |
break; |
case ObjectLiteral::Property::GETTER: |
if (property->emit_store()) { |
@@ -1495,7 +1499,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
DCHECK(property->emit_store()); |
CallRuntimeWithOperands(Runtime::kInternalSetPrototype); |
PrepareForBailoutForId(expr->GetIdForPropertySet(property_index), |
- NO_REGISTERS); |
+ BailoutState::NO_REGISTERS); |
} else { |
EmitPropertyKey(property, expr->GetIdForPropertyName(property_index)); |
VisitForStackValue(value); |
@@ -1568,7 +1572,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
FastCloneShallowArrayStub stub(isolate(), allocation_site_mode); |
__ CallStub(&stub); |
} |
- PrepareForBailoutForId(expr->CreateLiteralId(), TOS_REG); |
+ PrepareForBailoutForId(expr->CreateLiteralId(), BailoutState::TOS_REGISTER); |
bool result_saved = false; // Is the result saved to the stack? |
ZoneList<Expression*>* subexprs = expr->values(); |
@@ -1598,7 +1602,8 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
CallIC(ic); |
- PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS); |
+ PrepareForBailoutForId(expr->GetIdForElement(array_index), |
+ BailoutState::NO_REGISTERS); |
} |
// In case the array literal contains spread expressions it has two parts. The |
@@ -1618,7 +1623,8 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
VisitForStackValue(subexpr); |
CallRuntimeWithOperands(Runtime::kAppendElement); |
- PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS); |
+ PrepareForBailoutForId(expr->GetIdForElement(array_index), |
+ BailoutState::NO_REGISTERS); |
} |
if (result_saved) { |
@@ -1696,23 +1702,27 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) { |
switch (assign_type) { |
case VARIABLE: |
EmitVariableLoad(expr->target()->AsVariableProxy()); |
- PrepareForBailout(expr->target(), TOS_REG); |
+ PrepareForBailout(expr->target(), BailoutState::TOS_REGISTER); |
break; |
case NAMED_PROPERTY: |
EmitNamedPropertyLoad(property); |
- PrepareForBailoutForId(property->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(property->LoadId(), |
+ BailoutState::TOS_REGISTER); |
break; |
case NAMED_SUPER_PROPERTY: |
EmitNamedSuperPropertyLoad(property); |
- PrepareForBailoutForId(property->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(property->LoadId(), |
+ BailoutState::TOS_REGISTER); |
break; |
case KEYED_SUPER_PROPERTY: |
EmitKeyedSuperPropertyLoad(property); |
- PrepareForBailoutForId(property->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(property->LoadId(), |
+ BailoutState::TOS_REGISTER); |
break; |
case KEYED_PROPERTY: |
EmitKeyedPropertyLoad(property); |
- PrepareForBailoutForId(property->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(property->LoadId(), |
+ BailoutState::TOS_REGISTER); |
break; |
} |
} |
@@ -1731,7 +1741,7 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) { |
EmitBinaryOp(expr->binary_operation(), op); |
} |
// Deoptimization point in case the binary operation may have side effects. |
- PrepareForBailout(expr->binary_operation(), TOS_REG); |
+ PrepareForBailout(expr->binary_operation(), BailoutState::TOS_REGISTER); |
} else { |
VisitForAccumulatorValue(expr->value()); |
} |
@@ -1743,7 +1753,7 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) { |
case VARIABLE: |
EmitVariableAssignment(expr->target()->AsVariableProxy()->var(), |
expr->op(), expr->AssignmentSlot()); |
- PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
+ PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
context()->Plug(rax); |
break; |
case NAMED_PROPERTY: |
@@ -2166,7 +2176,7 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) { |
EmitLoadStoreICSlot(expr->AssignmentSlot()); |
CallStoreIC(); |
- PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
+ PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
context()->Plug(rax); |
} |
@@ -2210,7 +2220,7 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
EmitLoadStoreICSlot(expr->AssignmentSlot()); |
CallIC(ic); |
- PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
+ PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
context()->Plug(rax); |
} |
@@ -2231,7 +2241,7 @@ void FullCodeGenerator::EmitCallWithLoadIC(Call* expr) { |
if (callee->IsVariableProxy()) { |
{ StackValueContext context(this); |
EmitVariableLoad(callee->AsVariableProxy()); |
- PrepareForBailout(callee, NO_REGISTERS); |
+ PrepareForBailout(callee, BailoutState::NO_REGISTERS); |
} |
// Push undefined as receiver. This is patched in the Call builtin if it |
// is a sloppy mode method. |
@@ -2243,7 +2253,8 @@ void FullCodeGenerator::EmitCallWithLoadIC(Call* expr) { |
DCHECK(!callee->AsProperty()->IsSuperAccess()); |
__ movp(LoadDescriptor::ReceiverRegister(), Operand(rsp, 0)); |
EmitNamedPropertyLoad(callee->AsProperty()); |
- PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(callee->AsProperty()->LoadId(), |
+ BailoutState::TOS_REGISTER); |
// Push the target function under the receiver. |
PushOperand(Operand(rsp, 0)); |
__ movp(Operand(rsp, kPointerSize), rax); |
@@ -2279,7 +2290,7 @@ void FullCodeGenerator::EmitSuperCallWithLoadIC(Call* expr) { |
// - home_object |
// - key |
CallRuntimeWithOperands(Runtime::kLoadFromSuper); |
- PrepareForBailoutForId(prop->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER); |
// Replace home_object with target function. |
__ movp(Operand(rsp, kPointerSize), rax); |
@@ -2304,7 +2315,8 @@ void FullCodeGenerator::EmitKeyedCallWithLoadIC(Call* expr, |
__ movp(LoadDescriptor::ReceiverRegister(), Operand(rsp, 0)); |
__ Move(LoadDescriptor::NameRegister(), rax); |
EmitKeyedPropertyLoad(callee->AsProperty()); |
- PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(callee->AsProperty()->LoadId(), |
+ BailoutState::TOS_REGISTER); |
// Push the target function under the receiver. |
PushOperand(Operand(rsp, 0)); |
@@ -2337,7 +2349,7 @@ void FullCodeGenerator::EmitKeyedSuperCallWithLoadIC(Call* expr) { |
// - home_object |
// - key |
CallRuntimeWithOperands(Runtime::kLoadKeyedFromSuper); |
- PrepareForBailoutForId(prop->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER); |
// Replace home_object with target function. |
__ movp(Operand(rsp, kPointerSize), rax); |
@@ -2357,7 +2369,7 @@ void FullCodeGenerator::EmitCall(Call* expr, ConvertReceiverMode mode) { |
VisitForStackValue(args->at(i)); |
} |
- PrepareForBailoutForId(expr->CallId(), NO_REGISTERS); |
+ PrepareForBailoutForId(expr->CallId(), BailoutState::NO_REGISTERS); |
SetCallPosition(expr, expr->tail_call_mode()); |
if (expr->tail_call_mode() == TailCallMode::kAllow) { |
if (FLAG_trace) { |
@@ -2425,7 +2437,7 @@ void FullCodeGenerator::PushCalleeAndWithBaseObject(Call* expr) { |
__ CallRuntime(Runtime::kLoadLookupSlotForCall); |
PushOperand(rax); // Function. |
PushOperand(rdx); // Receiver. |
- PrepareForBailoutForId(expr->LookupId(), NO_REGISTERS); |
+ PrepareForBailoutForId(expr->LookupId(), BailoutState::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. |
@@ -2471,7 +2483,7 @@ void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) { |
// Touch up the callee. |
__ movp(Operand(rsp, (arg_count + 1) * kPointerSize), rax); |
- PrepareForBailoutForId(expr->EvalId(), NO_REGISTERS); |
+ PrepareForBailoutForId(expr->EvalId(), BailoutState::NO_REGISTERS); |
SetCallPosition(expr); |
__ movp(rdi, Operand(rsp, (arg_count + 1) * kPointerSize)); |
@@ -2520,7 +2532,7 @@ void FullCodeGenerator::VisitCallNew(CallNew* expr) { |
CallConstructStub stub(isolate()); |
__ Call(stub.GetCode(), RelocInfo::CODE_TARGET); |
OperandStackDepthDecrement(arg_count + 1); |
- PrepareForBailoutForId(expr->ReturnId(), TOS_REG); |
+ PrepareForBailoutForId(expr->ReturnId(), BailoutState::TOS_REGISTER); |
RestoreContext(); |
context()->Plug(rax); |
} |
@@ -2953,7 +2965,7 @@ void FullCodeGenerator::EmitCall(CallRuntime* expr) { |
for (Expression* const arg : *args) { |
VisitForStackValue(arg); |
} |
- PrepareForBailoutForId(expr->CallId(), NO_REGISTERS); |
+ PrepareForBailoutForId(expr->CallId(), BailoutState::NO_REGISTERS); |
// Move target to rdi. |
int const argc = args->length() - 2; |
__ movp(rdi, Operand(rsp, (argc + 1) * kPointerSize)); |
@@ -3166,7 +3178,8 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { |
&materialize_true); |
if (!context()->IsAccumulatorValue()) OperandStackDepthIncrement(1); |
__ bind(&materialize_true); |
- PrepareForBailoutForId(expr->MaterializeTrueId(), NO_REGISTERS); |
+ PrepareForBailoutForId(expr->MaterializeTrueId(), |
+ BailoutState::NO_REGISTERS); |
if (context()->IsAccumulatorValue()) { |
__ LoadRoot(rax, Heap::kTrueValueRootIndex); |
} else { |
@@ -3174,7 +3187,8 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { |
} |
__ jmp(&done, Label::kNear); |
__ bind(&materialize_false); |
- PrepareForBailoutForId(expr->MaterializeFalseId(), NO_REGISTERS); |
+ PrepareForBailoutForId(expr->MaterializeFalseId(), |
+ BailoutState::NO_REGISTERS); |
if (context()->IsAccumulatorValue()) { |
__ LoadRoot(rax, Heap::kFalseValueRootIndex); |
} else { |
@@ -3273,9 +3287,9 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
// 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(), TOS_REG); |
+ PrepareForBailout(expr->expression(), BailoutState::TOS_REGISTER); |
} else { |
- PrepareForBailoutForId(prop->LoadId(), TOS_REG); |
+ PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER); |
} |
// Inline smi case if we are in a loop. |
@@ -3328,7 +3342,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
// Convert old value into a number. |
ToNumberStub convert_stub(isolate()); |
__ CallStub(&convert_stub); |
- PrepareForBailoutForId(expr->ToNumberId(), TOS_REG); |
+ PrepareForBailoutForId(expr->ToNumberId(), BailoutState::TOS_REGISTER); |
// Save result for postfix expressions. |
if (expr->is_postfix()) { |
@@ -3376,7 +3390,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
{ EffectContext context(this); |
EmitVariableAssignment(expr->expression()->AsVariableProxy()->var(), |
Token::ASSIGN, expr->CountSlot()); |
- PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
+ PrepareForBailoutForId(expr->AssignmentId(), |
+ BailoutState::TOS_REGISTER); |
context.Plug(rax); |
} |
// For all contexts except kEffect: We have the result on |
@@ -3388,7 +3403,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
// Perform the assignment as if via '='. |
EmitVariableAssignment(expr->expression()->AsVariableProxy()->var(), |
Token::ASSIGN, expr->CountSlot()); |
- PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
+ PrepareForBailoutForId(expr->AssignmentId(), |
+ BailoutState::TOS_REGISTER); |
context()->Plug(rax); |
} |
break; |
@@ -3398,7 +3414,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
PopOperand(StoreDescriptor::ReceiverRegister()); |
EmitLoadStoreICSlot(expr->CountSlot()); |
CallStoreIC(); |
- PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
+ PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
if (expr->is_postfix()) { |
if (!context()->IsEffect()) { |
context()->PlugTOS(); |
@@ -3437,7 +3453,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
CodeFactory::KeyedStoreIC(isolate(), language_mode()).code(); |
EmitLoadStoreICSlot(expr->CountSlot()); |
CallIC(ic); |
- PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
+ PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
if (expr->is_postfix()) { |
if (!context()->IsEffect()) { |
context()->PlugTOS(); |