Chromium Code Reviews| Index: src/code-stubs.h |
| diff --git a/src/code-stubs.h b/src/code-stubs.h |
| index 85b0883db849033869eae4c5df248d9f907d7c83..a89155a6db4f97edca3e308cab7483e6947b4644 100644 |
| --- a/src/code-stubs.h |
| +++ b/src/code-stubs.h |
| @@ -63,7 +63,6 @@ namespace internal { |
| V(FastCloneRegExp) \ |
| V(FastCloneShallowArray) \ |
| V(FastFunctionBind) \ |
| - V(FastNewClosure) \ |
| V(FastNewContext) \ |
| V(FastNewObject) \ |
| V(FastNewRestParameter) \ |
| @@ -118,6 +117,7 @@ namespace internal { |
| V(InternalArraySingleArgumentConstructor) \ |
| V(Dec) \ |
| V(FastCloneShallowObject) \ |
| + V(FastNewClosure) \ |
| V(InstanceOf) \ |
| V(LessThan) \ |
| V(LessThanOrEqual) \ |
| @@ -1034,24 +1034,26 @@ class TypeofStub final : public HydrogenCodeStub { |
| DEFINE_HYDROGEN_CODE_STUB(Typeof, HydrogenCodeStub); |
| }; |
| - |
| -class FastNewClosureStub : public HydrogenCodeStub { |
| +class FastNewClosureStub : public TurboFanCodeStub { |
| public: |
| FastNewClosureStub(Isolate* isolate, LanguageMode language_mode, |
| FunctionKind kind) |
| - : HydrogenCodeStub(isolate) { |
| + : TurboFanCodeStub(isolate) { |
| DCHECK(IsValidFunctionKind(kind)); |
| - set_sub_minor_key(LanguageModeBits::encode(language_mode) | |
| - FunctionKindBits::encode(kind)); |
| + minor_key_ = (LanguageModeBits::encode(language_mode) | |
|
Benedikt Meurer
2016/06/27 18:33:55
So both the language_mode and the kind are deriv(e
rmcilroy
2016/06/29 21:11:48
Done. PTAL, thanks.
|
| + FunctionKindBits::encode(kind)); |
| } |
| + static compiler::Node* Generate(CodeStubAssembler* assembler, |
| + compiler::Node* shared_info, |
| + compiler::Node* map_index, |
| + compiler::Node* context); |
| + |
| LanguageMode language_mode() const { |
| - return LanguageModeBits::decode(sub_minor_key()); |
| + return LanguageModeBits::decode(MinorKey()); |
| } |
| - FunctionKind kind() const { |
| - return FunctionKindBits::decode(sub_minor_key()); |
| - } |
| + FunctionKind kind() const { return FunctionKindBits::decode(MinorKey()); } |
| private: |
| STATIC_ASSERT(LANGUAGE_END == 3); |
| @@ -1059,7 +1061,7 @@ class FastNewClosureStub : public HydrogenCodeStub { |
| class FunctionKindBits : public BitField<FunctionKind, 2, 9> {}; |
| DEFINE_CALL_INTERFACE_DESCRIPTOR(FastNewClosure); |
| - DEFINE_HYDROGEN_CODE_STUB(FastNewClosure, HydrogenCodeStub); |
| + DEFINE_TURBOFAN_CODE_STUB(FastNewClosure, TurboFanCodeStub); |
| }; |