Index: src/mips/full-codegen-mips.cc |
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc |
index 7c055436fe8773cdbd16eb702ea7fa403cca300d..ea338c46b3334c0cf65894f5f72c028bf1898ea5 100644 |
--- a/src/mips/full-codegen-mips.cc |
+++ b/src/mips/full-codegen-mips.cc |
@@ -14,6 +14,7 @@ |
// places where we have to move a previous result in v0 to a0 for the |
// next call: mov(a0, v0). This is not needed on the other architectures. |
+#include "src/code-factory.h" |
#include "src/code-stubs.h" |
#include "src/codegen.h" |
#include "src/compiler.h" |
@@ -1046,7 +1047,8 @@ void FullCodeGenerator::VisitSwitchStatement(SwitchStatement* stmt) { |
// Record position before stub call for type feedback. |
SetSourcePosition(clause->position()); |
- Handle<Code> ic = CompareIC::GetUninitialized(isolate(), Token::EQ_STRICT); |
+ Handle<Code> ic = |
+ CodeFactory::CompareIC(isolate(), Token::EQ_STRICT).code(); |
CallIC(ic, clause->CompareId()); |
patch_site.EmitPatchInfo(); |
@@ -2083,7 +2085,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ li(VectorLoadICDescriptor::SlotRegister(), |
Operand(Smi::FromInt(expr->KeyedLoadFeedbackSlot()))); |
} |
- Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize(); |
+ Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code(); |
CallIC(ic, TypeFeedbackId::None()); |
__ mov(a0, v0); |
__ mov(a1, a0); |
@@ -2291,7 +2293,7 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) { |
void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) { |
SetSourcePosition(prop->position()); |
- Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize(); |
+ Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code(); |
if (FLAG_vector_ics) { |
__ li(VectorLoadICDescriptor::SlotRegister(), |
Operand(Smi::FromInt(prop->PropertyFeedbackSlot()))); |
@@ -2325,8 +2327,8 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr, |
patch_site.EmitJumpIfSmi(scratch1, &smi_case); |
__ bind(&stub_call); |
- BinaryOpICStub stub(isolate(), op, mode); |
- CallIC(stub.GetCode(), expr->BinaryOperationFeedbackId()); |
+ Handle<Code> code = CodeFactory::BinaryOpIC(isolate(), op, mode).code(); |
+ CallIC(code, expr->BinaryOperationFeedbackId()); |
patch_site.EmitPatchInfo(); |
__ jmp(&done); |
@@ -2400,9 +2402,9 @@ void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr, |
OverwriteMode mode) { |
__ mov(a0, result_register()); |
__ pop(a1); |
- BinaryOpICStub stub(isolate(), op, mode); |
+ Handle<Code> code = CodeFactory::BinaryOpIC(isolate(), op, mode).code(); |
JumpPatchSite patch_site(masm_); // unbound, signals no inlined smi code. |
- CallIC(stub.GetCode(), expr->BinaryOperationFeedbackId()); |
+ CallIC(code, expr->BinaryOperationFeedbackId()); |
patch_site.EmitPatchInfo(); |
context()->Plug(v0); |
} |
@@ -2446,9 +2448,8 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) { |
__ mov(StoreDescriptor::NameRegister(), result_register()); |
__ Pop(StoreDescriptor::ValueRegister(), |
StoreDescriptor::ReceiverRegister()); |
- Handle<Code> ic = strict_mode() == SLOPPY |
- ? isolate()->builtins()->KeyedStoreIC_Initialize() |
- : isolate()->builtins()->KeyedStoreIC_Initialize_Strict(); |
+ Handle<Code> ic = |
+ CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code(); |
CallIC(ic); |
break; |
} |
@@ -2570,9 +2571,7 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
__ Pop(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister()); |
DCHECK(StoreDescriptor::ValueRegister().is(a0)); |
- Handle<Code> ic = strict_mode() == SLOPPY |
- ? isolate()->builtins()->KeyedStoreIC_Initialize() |
- : isolate()->builtins()->KeyedStoreIC_Initialize_Strict(); |
+ Handle<Code> ic = CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code(); |
CallIC(ic, expr->AssignmentFeedbackId()); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
@@ -4373,8 +4372,9 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
// Record position before stub call. |
SetSourcePosition(expr->position()); |
- BinaryOpICStub stub(isolate(), Token::ADD, NO_OVERWRITE); |
- CallIC(stub.GetCode(), expr->CountBinOpFeedbackId()); |
+ Handle<Code> code = |
+ CodeFactory::BinaryOpIC(isolate(), Token::ADD, NO_OVERWRITE).code(); |
+ CallIC(code, expr->CountBinOpFeedbackId()); |
patch_site.EmitPatchInfo(); |
__ bind(&done); |
@@ -4420,9 +4420,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
__ mov(StoreDescriptor::ValueRegister(), result_register()); |
__ Pop(StoreDescriptor::ReceiverRegister(), |
StoreDescriptor::NameRegister()); |
- Handle<Code> ic = strict_mode() == SLOPPY |
- ? isolate()->builtins()->KeyedStoreIC_Initialize() |
- : isolate()->builtins()->KeyedStoreIC_Initialize_Strict(); |
+ Handle<Code> ic = |
+ CodeFactory::KeyedStoreIC(isolate(), strict_mode()).code(); |
CallIC(ic, expr->CountStoreFeedbackId()); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
if (expr->is_postfix()) { |
@@ -4607,7 +4606,7 @@ void FullCodeGenerator::VisitCompareOperation(CompareOperation* expr) { |
} |
// Record position and call the compare IC. |
SetSourcePosition(expr->position()); |
- Handle<Code> ic = CompareIC::GetUninitialized(isolate(), op); |
+ Handle<Code> ic = CodeFactory::CompareIC(isolate(), op).code(); |
CallIC(ic, expr->CompareOperationFeedbackId()); |
patch_site.EmitPatchInfo(); |
PrepareForBailoutBeforeSplit(expr, true, if_true, if_false); |