From bcb67153cba9ca5ff68cd7df4ff88db7670cce9a Mon Sep 17 00:00:00 2001 From: "plind44@gmail.com" Date: Tue, 14 Jan 2014 18:33:36 +0000 Subject: [PATCH] MIPS: Get rid of ContextualMode for call ICs. Port r18594 (91e7cee) BUG= R=plind44@gmail.com Review URL: https://codereview.chromium.org/133223003 Patch from Balazs Kilvady . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18601 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/full-codegen-mips.cc | 9 +++------ src/mips/lithium-codegen-mips.cc | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc index d44caa8..89a4168 100644 --- a/src/mips/full-codegen-mips.cc +++ b/src/mips/full-codegen-mips.cc @@ -2648,8 +2648,7 @@ void FullCodeGenerator::EmitCallWithIC(Call* expr, // Record source position for debugger. SetSourcePosition(expr->position()); // Call the IC initialization code. - Handle ic = - isolate()->stub_cache()->ComputeCallInitialize(arg_count, mode); + Handle ic = isolate()->stub_cache()->ComputeCallInitialize(arg_count); TypeFeedbackId ast_id = mode == CONTEXTUAL ? TypeFeedbackId::None() : expr->CallFeedbackId(); @@ -4216,10 +4215,8 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) { if (expr->is_jsruntime()) { // Call the JS runtime function. __ li(a2, Operand(expr->name())); - ContextualMode mode = NOT_CONTEXTUAL; - Handle ic = - isolate()->stub_cache()->ComputeCallInitialize(arg_count, mode); - CallIC(ic, mode, expr->CallRuntimeFeedbackId()); + Handle ic = isolate()->stub_cache()->ComputeCallInitialize(arg_count); + CallIC(ic, NOT_CONTEXTUAL, expr->CallRuntimeFeedbackId()); // Restore context register. __ lw(cp, MemOperand(fp, StandardFrameConstants::kContextOffset)); } else { diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc index 6b40b92..05fc384 100644 --- a/src/mips/lithium-codegen-mips.cc +++ b/src/mips/lithium-codegen-mips.cc @@ -3905,8 +3905,7 @@ void LCodeGen::DoCallNamed(LCallNamed* instr) { ASSERT(ToRegister(instr->result()).is(v0)); int arity = instr->arity(); - Handle ic = - isolate()->stub_cache()->ComputeCallInitialize(arity, NOT_CONTEXTUAL); + Handle ic = isolate()->stub_cache()->ComputeCallInitialize(arity); __ li(a2, Operand(instr->name())); CallCode(ic, RelocInfo::CODE_TARGET, instr); } @@ -3933,8 +3932,7 @@ void LCodeGen::DoCallGlobal(LCallGlobal* instr) { ASSERT(ToRegister(instr->result()).is(v0)); int arity = instr->arity(); - Handle ic = - isolate()->stub_cache()->ComputeCallInitialize(arity, CONTEXTUAL); + Handle ic = isolate()->stub_cache()->ComputeCallInitialize(arity); __ li(a2, Operand(instr->name())); CallCode(ic, RelocInfo::CODE_TARGET, instr); } -- 2.7.4