Index: src/code-stubs.h |
diff --git a/src/code-stubs.h b/src/code-stubs.h |
index 43c8a272397634f05c60f50939fa2a00a2020907..8363a376b205c66f94a06e2e1e51a70aea08e3df 100644 |
--- a/src/code-stubs.h |
+++ b/src/code-stubs.h |
@@ -83,8 +83,6 @@ class ObjectLiteral; |
/* as part of the new IC system, ask */ \ |
/* ishell before doing anything */ \ |
V(KeyedLoadGeneric) \ |
- V(KeyedLoadSloppyArguments) \ |
- V(KeyedStoreSloppyArguments) \ |
V(LoadConstant) \ |
V(LoadDictionaryElement) \ |
V(LoadFastElement) \ |
@@ -151,6 +149,8 @@ class ObjectLiteral; |
V(GreaterThanOrEqual) \ |
V(Equal) \ |
V(NotEqual) \ |
+ V(KeyedLoadSloppyArguments) \ |
+ V(KeyedStoreSloppyArguments) \ |
V(StrictEqual) \ |
V(StrictNotEqual) \ |
V(StringEqual) \ |
@@ -1551,35 +1551,36 @@ class LoadFieldStub: public HandlerStub { |
DEFINE_HANDLER_CODE_STUB(LoadField, HandlerStub); |
}; |
- |
-class KeyedLoadSloppyArgumentsStub : public HandlerStub { |
+class KeyedLoadSloppyArgumentsStub : public TurboFanCodeStub { |
public: |
explicit KeyedLoadSloppyArgumentsStub(Isolate* isolate) |
- : HandlerStub(isolate) {} |
+ : TurboFanCodeStub(isolate) {} |
- protected: |
- Code::Kind kind() const override { return Code::KEYED_LOAD_IC; } |
+ Code::Kind GetCodeKind() const override { return Code::HANDLER; } |
+ ExtraICState GetExtraICState() const override { return Code::LOAD_IC; } |
+ protected: |
DEFINE_CALL_INTERFACE_DESCRIPTOR(LoadWithVector); |
- DEFINE_HANDLER_CODE_STUB(KeyedLoadSloppyArguments, HandlerStub); |
+ DEFINE_TURBOFAN_CODE_STUB(KeyedLoadSloppyArguments, TurboFanCodeStub); |
}; |
class CommonStoreModeBits : public BitField<KeyedAccessStoreMode, 0, 3> {}; |
-class KeyedStoreSloppyArgumentsStub : public HandlerStub { |
+class KeyedStoreSloppyArgumentsStub : public TurboFanCodeStub { |
public: |
explicit KeyedStoreSloppyArgumentsStub(Isolate* isolate, |
KeyedAccessStoreMode mode) |
- : HandlerStub(isolate) { |
- set_sub_minor_key(CommonStoreModeBits::encode(mode)); |
+ : TurboFanCodeStub(isolate) { |
+ minor_key_ = CommonStoreModeBits::encode(mode); |
} |
- protected: |
- Code::Kind kind() const override { return Code::KEYED_STORE_IC; } |
+ Code::Kind GetCodeKind() const override { return Code::HANDLER; } |
+ ExtraICState GetExtraICState() const override { return Code::STORE_IC; } |
+ protected: |
DEFINE_CALL_INTERFACE_DESCRIPTOR(StoreWithVector); |
- DEFINE_HANDLER_CODE_STUB(KeyedStoreSloppyArguments, HandlerStub); |
+ DEFINE_TURBOFAN_CODE_STUB(KeyedStoreSloppyArguments, TurboFanCodeStub); |
}; |