| Index: src/mips64/lithium-codegen-mips64.cc
|
| diff --git a/src/mips64/lithium-codegen-mips64.cc b/src/mips64/lithium-codegen-mips64.cc
|
| index 2e5589b05d2baf5cb70dd5627bdb5ce29b9f946e..87fca40c2e5d8813ddf5eac8eaae9c798d2951c9 100644
|
| --- a/src/mips64/lithium-codegen-mips64.cc
|
| +++ b/src/mips64/lithium-codegen-mips64.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "src/v8.h"
|
|
|
| +#include "src/code-factory.h"
|
| #include "src/code-stubs.h"
|
| #include "src/hydrogen-osr.h"
|
| #include "src/ic/stub-cache.h"
|
| @@ -2012,8 +2013,9 @@ void LCodeGen::DoArithmeticT(LArithmeticT* instr) {
|
| DCHECK(ToRegister(instr->right()).is(a0));
|
| DCHECK(ToRegister(instr->result()).is(v0));
|
|
|
| - BinaryOpICStub stub(isolate(), instr->op(), NO_OVERWRITE);
|
| - CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr);
|
| + Handle<Code> code =
|
| + CodeFactory::BinaryOpIC(isolate(), instr->op(), NO_OVERWRITE).code();
|
| + CallCode(code, RelocInfo::CODE_TARGET, instr);
|
| // Other arch use a nop here, to signal that there is no inlined
|
| // patchable code. Mips does not need the nop, since our marker
|
| // instruction (andi zero_reg) will never be used in normal code.
|
| @@ -2495,7 +2497,7 @@ void LCodeGen::DoStringCompareAndBranch(LStringCompareAndBranch* instr) {
|
| DCHECK(ToRegister(instr->context()).is(cp));
|
| Token::Value op = instr->op();
|
|
|
| - Handle<Code> ic = CompareIC::GetUninitialized(isolate(), op);
|
| + Handle<Code> ic = CodeFactory::CompareIC(isolate(), op).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
|
|
| Condition condition = ComputeCompareCondition(op);
|
| @@ -2796,7 +2798,7 @@ void LCodeGen::DoCmpT(LCmpT* instr) {
|
| DCHECK(ToRegister(instr->context()).is(cp));
|
| Token::Value op = instr->op();
|
|
|
| - Handle<Code> ic = CompareIC::GetUninitialized(isolate(), op);
|
| + Handle<Code> ic = CodeFactory::CompareIC(isolate(), op).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| // On MIPS there is no need for a "no inlined smi code" marker (nop).
|
|
|
| @@ -2890,7 +2892,7 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) {
|
| EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr);
|
| }
|
| ContextualMode mode = instr->for_typeof() ? NOT_CONTEXTUAL : CONTEXTUAL;
|
| - Handle<Code> ic = LoadIC::initialize_stub(isolate(), mode);
|
| + Handle<Code> ic = CodeFactory::LoadIC(isolate(), mode).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
| @@ -3031,7 +3033,7 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) {
|
| if (FLAG_vector_ics) {
|
| EmitVectorLoadICRegisters<LLoadNamedGeneric>(instr);
|
| }
|
| - Handle<Code> ic = LoadIC::initialize_stub(isolate(), NOT_CONTEXTUAL);
|
| + Handle<Code> ic = CodeFactory::LoadIC(isolate(), NOT_CONTEXTUAL).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
| @@ -3380,7 +3382,7 @@ void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) {
|
| EmitVectorLoadICRegisters<LLoadKeyedGeneric>(instr);
|
| }
|
|
|
| - Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize();
|
| + Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
| @@ -4493,9 +4495,8 @@ void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) {
|
| DCHECK(ToRegister(instr->key()).is(StoreDescriptor::NameRegister()));
|
| DCHECK(ToRegister(instr->value()).is(StoreDescriptor::ValueRegister()));
|
|
|
| - Handle<Code> ic = (instr->strict_mode() == STRICT)
|
| - ? isolate()->builtins()->KeyedStoreIC_Initialize_Strict()
|
| - : isolate()->builtins()->KeyedStoreIC_Initialize();
|
| + Handle<Code> ic =
|
| + CodeFactory::KeyedStoreIC(isolate(), instr->strict_mode()).code();
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
|
|