Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 27952f34014e5ec74602be20b3b0f6012e25dada..2291e64d14b425f9d6248fa3de6376ed2e1967fa 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -7,6 +7,7 @@ |
#if V8_TARGET_ARCH_IA32 |
#include "src/base/bits.h" |
+#include "src/code-factory.h" |
#include "src/code-stubs.h" |
#include "src/codegen.h" |
#include "src/deoptimizer.h" |
@@ -2033,8 +2034,9 @@ void LCodeGen::DoArithmeticT(LArithmeticT* instr) { |
DCHECK(ToRegister(instr->right()).is(eax)); |
DCHECK(ToRegister(instr->result()).is(eax)); |
- 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); |
} |
@@ -2459,7 +2461,7 @@ static Condition ComputeCompareCondition(Token::Value op) { |
void LCodeGen::DoStringCompareAndBranch(LStringCompareAndBranch* instr) { |
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); |
@@ -2730,7 +2732,7 @@ void LCodeGen::DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr, |
void LCodeGen::DoCmpT(LCmpT* instr) { |
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); |
@@ -2854,7 +2856,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); |
} |
@@ -2990,7 +2992,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); |
} |
@@ -3216,7 +3218,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); |
} |
@@ -4282,9 +4284,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); |
} |