Index: src/builtins/builtins-function.cc |
diff --git a/src/builtins/builtins-function.cc b/src/builtins/builtins-function.cc |
index d08b109d112a4ce0d428699db48a57e1dc0ee221..8ba005cb4a09d292e9c3cbb5c233035ae006248f 100644 |
--- a/src/builtins/builtins-function.cc |
+++ b/src/builtins/builtins-function.cc |
@@ -5,7 +5,6 @@ |
#include "src/builtins/builtins-utils.h" |
#include "src/builtins/builtins.h" |
#include "src/code-factory.h" |
-#include "src/code-stub-assembler.h" |
#include "src/compiler.h" |
#include "src/conversions.h" |
#include "src/counters.h" |
@@ -272,162 +271,6 @@ Object* DoFunctionBind(Isolate* isolate, BuiltinArguments args) { |
// ES6 section 19.2.3.2 Function.prototype.bind ( thisArg, ...args ) |
BUILTIN(FunctionPrototypeBind) { return DoFunctionBind(isolate, args); } |
-TF_BUILTIN(FastFunctionPrototypeBind, CodeStubAssembler) { |
- Label slow(this); |
- |
- Node* argc = Parameter(BuiltinDescriptor::kArgumentsCount); |
- Node* context = Parameter(BuiltinDescriptor::kContext); |
- Node* new_target = Parameter(BuiltinDescriptor::kNewTarget); |
- |
- CodeStubArguments args(this, ChangeInt32ToIntPtr(argc)); |
- |
- // Check that receiver has instance type of JS_FUNCTION_TYPE |
- Node* receiver = args.GetReceiver(); |
- GotoIf(TaggedIsSmi(receiver), &slow); |
- |
- Node* receiver_map = LoadMap(receiver); |
- Node* instance_type = LoadMapInstanceType(receiver_map); |
- GotoIf(Word32NotEqual(instance_type, Int32Constant(JS_FUNCTION_TYPE)), &slow); |
- |
- // Disallow binding of slow-mode functions. We need to figure out whether the |
- // length and name property are in the original state. |
- Comment("Disallow binding of slow-mode functions"); |
- GotoIf(IsDictionaryMap(receiver_map), &slow); |
- |
- // Check whether the length and name properties are still present as |
- // AccessorInfo objects. In that case, their value can be recomputed even if |
- // the actual value on the object changes. |
- Comment("Check descriptor array length"); |
- Node* descriptors = LoadMapDescriptors(receiver_map); |
- Node* descriptors_length = LoadFixedArrayBaseLength(descriptors); |
- GotoIf(SmiLessThanOrEqual(descriptors_length, SmiConstant(1)), &slow); |
- |
- // Check whether the length and name properties are still present as |
- // AccessorInfo objects. In that case, their value can be recomputed even if |
- // the actual value on the object changes. |
- Comment("Check name and length properties"); |
- const int length_index = JSFunction::kLengthDescriptorIndex; |
- Node* maybe_length = LoadFixedArrayElement( |
- descriptors, DescriptorArray::ToKeyIndex(length_index)); |
- GotoIf(WordNotEqual(maybe_length, LoadRoot(Heap::klength_stringRootIndex)), |
- &slow); |
- |
- Node* maybe_length_accessor = LoadFixedArrayElement( |
- descriptors, DescriptorArray::ToValueIndex(length_index)); |
- GotoIf(TaggedIsSmi(maybe_length_accessor), &slow); |
- Node* length_value_map = LoadMap(maybe_length_accessor); |
- GotoIfNot(IsAccessorInfoMap(length_value_map), &slow); |
- |
- const int name_index = JSFunction::kNameDescriptorIndex; |
- Node* maybe_name = LoadFixedArrayElement( |
- descriptors, DescriptorArray::ToKeyIndex(name_index)); |
- GotoIf(WordNotEqual(maybe_name, LoadRoot(Heap::kname_stringRootIndex)), |
- &slow); |
- |
- Node* maybe_name_accessor = LoadFixedArrayElement( |
- descriptors, DescriptorArray::ToValueIndex(name_index)); |
- GotoIf(TaggedIsSmi(maybe_name_accessor), &slow); |
- Node* name_value_map = LoadMap(maybe_name_accessor); |
- GotoIfNot(IsAccessorInfoMap(name_value_map), &slow); |
- |
- // Choose the right bound function map based on whether the target is |
- // constructable. |
- Comment("Choose the right bound function map"); |
- Variable bound_function_map(this, MachineRepresentation::kTagged); |
- Label with_constructor(this); |
- VariableList vars({&bound_function_map}, zone()); |
- Node* native_context = LoadNativeContext(context); |
- |
- Label map_done(this, vars); |
- Node* bit_field = LoadMapBitField(receiver_map); |
- int mask = static_cast<int>(1 << Map::kIsConstructor); |
- GotoIf(IsSetWord32(bit_field, mask), &with_constructor); |
- |
- bound_function_map.Bind(LoadContextElement( |
- native_context, Context::BOUND_FUNCTION_WITHOUT_CONSTRUCTOR_MAP_INDEX)); |
- Goto(&map_done); |
- |
- Bind(&with_constructor); |
- bound_function_map.Bind(LoadContextElement( |
- native_context, Context::BOUND_FUNCTION_WITH_CONSTRUCTOR_MAP_INDEX)); |
- Goto(&map_done); |
- |
- Bind(&map_done); |
- |
- // Verify that __proto__ matches that of a the target bound function. |
- Comment("Verify that __proto__ matches target bound function"); |
- Node* prototype = LoadMapPrototype(receiver_map); |
- Node* expected_prototype = LoadMapPrototype(bound_function_map.value()); |
- GotoIf(WordNotEqual(prototype, expected_prototype), &slow); |
- |
- // Allocate the arguments array. |
- Comment("Allocate the arguments array"); |
- Variable argument_array(this, MachineRepresentation::kTagged); |
- Label empty_arguments(this); |
- Label arguments_done(this, &argument_array); |
- GotoIf(Uint32LessThanOrEqual(argc, Int32Constant(1)), &empty_arguments); |
- Node* elements_length = ChangeUint32ToWord(Int32Sub(argc, Int32Constant(1))); |
- Node* elements = AllocateFixedArray(FAST_ELEMENTS, elements_length); |
- Variable index(this, MachineType::PointerRepresentation()); |
- index.Bind(IntPtrConstant(0)); |
- VariableList foreach_vars({&index}, zone()); |
- args.ForEach(foreach_vars, |
- [this, elements, &index](Node* arg) { |
- StoreFixedArrayElement(elements, index.value(), arg); |
- Increment(index); |
- }, |
- IntPtrConstant(1)); |
- argument_array.Bind(elements); |
- Goto(&arguments_done); |
- |
- Bind(&empty_arguments); |
- argument_array.Bind(EmptyFixedArrayConstant()); |
- Goto(&arguments_done); |
- |
- Bind(&arguments_done); |
- |
- // Determine bound receiver. |
- Comment("Determine bound receiver"); |
- Variable bound_receiver(this, MachineRepresentation::kTagged); |
- Label has_receiver(this); |
- Label receiver_done(this, &bound_receiver); |
- GotoIf(Word32NotEqual(argc, Int32Constant(0)), &has_receiver); |
- bound_receiver.Bind(UndefinedConstant()); |
- Goto(&receiver_done); |
- |
- Bind(&has_receiver); |
- bound_receiver.Bind(args.AtIndex(0)); |
- Goto(&receiver_done); |
- |
- Bind(&receiver_done); |
- |
- // Allocate the resulting bound function. |
- Comment("Allocate the resulting bound function"); |
- Node* bound_function = Allocate(JSBoundFunction::kSize); |
- StoreMapNoWriteBarrier(bound_function, bound_function_map.value()); |
- StoreObjectFieldNoWriteBarrier( |
- bound_function, JSBoundFunction::kBoundTargetFunctionOffset, receiver); |
- StoreObjectFieldNoWriteBarrier(bound_function, |
- JSBoundFunction::kBoundThisOffset, |
- bound_receiver.value()); |
- StoreObjectFieldNoWriteBarrier(bound_function, |
- JSBoundFunction::kBoundArgumentsOffset, |
- argument_array.value()); |
- Node* empty_fixed_array = EmptyFixedArrayConstant(); |
- StoreObjectFieldNoWriteBarrier(bound_function, JSObject::kPropertiesOffset, |
- empty_fixed_array); |
- StoreObjectFieldNoWriteBarrier(bound_function, JSObject::kElementsOffset, |
- empty_fixed_array); |
- |
- args.PopAndReturn(bound_function); |
- Bind(&slow); |
- |
- Node* target = LoadFromFrame(StandardFrameConstants::kFunctionOffset, |
- MachineType::TaggedPointer()); |
- TailCallStub(CodeFactory::FunctionPrototypeBind(isolate()), context, target, |
- new_target, argc); |
-} |
- |
// TODO(verwaest): This is a temporary helper until the FastFunctionBind stub |
// can tailcall to the builtin directly. |
RUNTIME_FUNCTION(Runtime_FunctionBind) { |
@@ -454,14 +297,5 @@ BUILTIN(FunctionPrototypeToString) { |
"Function.prototype.toString"))); |
} |
-// ES6 section 19.2.3.6 Function.prototype [ @@hasInstance ] ( V ) |
-TF_BUILTIN(FunctionPrototypeHasInstance, CodeStubAssembler) { |
- Node* f = Parameter(0); |
- Node* v = Parameter(1); |
- Node* context = Parameter(4); |
- Node* result = OrdinaryHasInstance(context, f, v); |
- Return(result); |
-} |
- |
} // namespace internal |
} // namespace v8 |