Chromium Code Reviews| Index: src/ia32/full-codegen-ia32.cc |
| diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
| index 857622d5459d2f9351f716c63770c35da2f23e1a..838e1a10c78ff216a7c50d8d401561404e80717e 100644 |
| --- a/src/ia32/full-codegen-ia32.cc |
| +++ b/src/ia32/full-codegen-ia32.cc |
| @@ -876,6 +876,7 @@ void FullCodeGenerator::VisitSwitchStatement(SwitchStatement* stmt) { |
| // Record position before stub call for type feedback. |
| SetSourcePosition(clause->position()); |
| Handle<Code> ic = CompareIC::GetUninitialized(Token::EQ_STRICT); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET, clause->CompareId()); |
| patch_site.EmitPatchInfo(); |
| __ test(eax, eax); |
| @@ -1186,6 +1187,7 @@ void FullCodeGenerator::EmitLoadGlobalCheckExtensions(Variable* var, |
| __ mov(eax, GlobalObjectOperand()); |
| __ mov(ecx, var->name()); |
| Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize(); |
| + info_->increment_number_of_ics(); |
| RelocInfo::Mode mode = (typeof_state == INSIDE_TYPEOF) |
| ? RelocInfo::CODE_TARGET |
| : RelocInfo::CODE_TARGET_CONTEXT; |
| @@ -1270,6 +1272,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { |
| __ mov(eax, GlobalObjectOperand()); |
| __ mov(ecx, var->name()); |
| Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET_CONTEXT); |
| context()->Plug(eax); |
| break; |
| @@ -1470,6 +1473,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
| Handle<Code> ic = is_classic_mode() |
| ? isolate()->builtins()->StoreIC_Initialize() |
| : isolate()->builtins()->StoreIC_Initialize_Strict(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET, key->id()); |
| PrepareForBailoutForId(key->id(), NO_REGISTERS); |
| } else { |
| @@ -1734,6 +1738,7 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) { |
| ASSERT(!key->handle()->IsSmi()); |
| __ mov(ecx, Immediate(key->handle())); |
| Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET, prop->id()); |
| } |
| @@ -1741,6 +1746,7 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) { |
| void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) { |
| SetSourcePosition(prop->position()); |
| Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET, prop->id()); |
| } |
| @@ -1762,6 +1768,7 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr, |
| __ bind(&stub_call); |
| __ mov(eax, ecx); |
| BinaryOpStub stub(op, mode); |
| + info_->increment_number_of_ics(); |
| __ call(stub.GetCode(), RelocInfo::CODE_TARGET, expr->id()); |
| patch_site.EmitPatchInfo(); |
| __ jmp(&done, Label::kNear); |
| @@ -1847,6 +1854,7 @@ void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr, |
| __ pop(edx); |
| BinaryOpStub stub(op, mode); |
| JumpPatchSite patch_site(masm_); // unbound, signals no inlined smi code. |
| + info_->increment_number_of_ics(); |
| __ call(stub.GetCode(), RelocInfo::CODE_TARGET, expr->id()); |
| patch_site.EmitPatchInfo(); |
| context()->Plug(eax); |
| @@ -1888,6 +1896,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, int bailout_ast_id) { |
| Handle<Code> ic = is_classic_mode() |
| ? isolate()->builtins()->StoreIC_Initialize() |
| : isolate()->builtins()->StoreIC_Initialize_Strict(); |
| + info_->increment_number_of_ics(); |
| __ call(ic); |
| break; |
| } |
| @@ -1901,6 +1910,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, int bailout_ast_id) { |
| Handle<Code> ic = is_classic_mode() |
| ? isolate()->builtins()->KeyedStoreIC_Initialize() |
| : isolate()->builtins()->KeyedStoreIC_Initialize_Strict(); |
| + info_->increment_number_of_ics(); |
| __ call(ic); |
| break; |
| } |
| @@ -1919,6 +1929,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, |
| Handle<Code> ic = is_classic_mode() |
| ? isolate()->builtins()->StoreIC_Initialize() |
| : isolate()->builtins()->StoreIC_Initialize_Strict(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET_CONTEXT); |
| } else if (op == Token::INIT_CONST) { |
| @@ -2028,6 +2039,7 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) { |
| Handle<Code> ic = is_classic_mode() |
| ? isolate()->builtins()->StoreIC_Initialize() |
| : isolate()->builtins()->StoreIC_Initialize_Strict(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET, expr->id()); |
| // If the assignment ends an initialization block, revert to fast case. |
| @@ -2068,6 +2080,7 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
| Handle<Code> ic = is_classic_mode() |
| ? isolate()->builtins()->KeyedStoreIC_Initialize() |
| : isolate()->builtins()->KeyedStoreIC_Initialize_Strict(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET, expr->id()); |
| // If the assignment ends an initialization block, revert to fast case. |
| @@ -2118,6 +2131,7 @@ void FullCodeGenerator::EmitCallWithIC(Call* expr, |
| SetSourcePosition(expr->position()); |
| Handle<Code> ic = |
| isolate()->stub_cache()->ComputeCallInitialize(arg_count, mode); |
| + info_->increment_number_of_ics(); |
| __ call(ic, mode, expr->id()); |
| RecordJSReturnSite(expr); |
| // Restore context register. |
| @@ -2149,6 +2163,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, |
| SetSourcePosition(expr->position()); |
| Handle<Code> ic = |
| isolate()->stub_cache()->ComputeKeyedCallInitialize(arg_count); |
| + info_->increment_number_of_ics(); |
| __ mov(ecx, Operand(esp, (arg_count + 1) * kPointerSize)); // Key. |
| __ call(ic, RelocInfo::CODE_TARGET, expr->id()); |
| RecordJSReturnSite(expr); |
| @@ -3737,6 +3752,7 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) { |
| RelocInfo::Mode mode = RelocInfo::CODE_TARGET; |
| Handle<Code> ic = |
| isolate()->stub_cache()->ComputeCallInitialize(arg_count, mode); |
| + info_->increment_number_of_ics(); |
| __ call(ic, mode, expr->id()); |
| // Restore context register. |
| __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset)); |
| @@ -3891,6 +3907,7 @@ void FullCodeGenerator::EmitUnaryOperation(UnaryOperation* expr, |
| UnaryOverwriteMode overwrite = |
| can_overwrite ? UNARY_OVERWRITE : UNARY_NO_OVERWRITE; |
| UnaryOpStub stub(expr->op(), overwrite); |
| + info_->increment_number_of_ics(); |
| // UnaryOpStub expects the argument to be in the |
| // accumulator register eax. |
| VisitForAccumulatorValue(expr->expression()); |
| @@ -4015,6 +4032,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
| __ mov(edx, eax); |
| __ mov(eax, Immediate(Smi::FromInt(1))); |
| BinaryOpStub stub(expr->binary_op(), NO_OVERWRITE); |
| + info_->increment_number_of_ics(); |
| __ call(stub.GetCode(), RelocInfo::CODE_TARGET, expr->CountId()); |
| patch_site.EmitPatchInfo(); |
| __ bind(&done); |
| @@ -4049,6 +4067,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
| Handle<Code> ic = is_classic_mode() |
| ? isolate()->builtins()->StoreIC_Initialize() |
| : isolate()->builtins()->StoreIC_Initialize_Strict(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET, expr->id()); |
| PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
| if (expr->is_postfix()) { |
| @@ -4066,6 +4085,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
| Handle<Code> ic = is_classic_mode() |
| ? isolate()->builtins()->KeyedStoreIC_Initialize() |
| : isolate()->builtins()->KeyedStoreIC_Initialize_Strict(); |
| + info_->increment_number_of_ics(); |
| __ call(ic, RelocInfo::CODE_TARGET, expr->id()); |
| PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
| if (expr->is_postfix()) { |
| @@ -4092,6 +4112,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) { |
| __ mov(eax, GlobalObjectOperand()); |
| __ mov(ecx, Immediate(proxy->name())); |
| Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize(); |
| + info_->increment_number_of_ics(); |
| // Use a regular load, not a contextual load, to avoid a reference |
| // error. |
| __ call(ic); |
| @@ -4274,6 +4295,7 @@ void FullCodeGenerator::VisitCompareOperation(CompareOperation* expr) { |
| // Record position and call the compare IC. |
| SetSourcePosition(expr->position()); |
| Handle<Code> ic = CompareIC::GetUninitialized(op); |
| + info_->increment_number_of_ics(); |
|
Vyacheslav Egorov (Chromium)
2012/02/15 12:07:39
Please wrap increment and __ call together into a
Jakob Kummerow
2012/02/17 16:07:52
Done.
|
| __ call(ic, RelocInfo::CODE_TARGET, expr->id()); |
| patch_site.EmitPatchInfo(); |