diff options
| author | Michaël Zasso <targos@protonmail.com> | 2017-12-05 16:41:55 +0100 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2017-12-06 12:52:07 +0100 |
| commit | 1854ba04e9a68f062beb299dd6e1479279b26363 (patch) | |
| tree | d5b2df9b8c1deb6388f7a728fca8e1c98c779abe /deps/v8/src/builtins/builtins-conversion-gen.cc | |
| parent | b52c23b75f96e1c9d2c7b3a7e5619170d0a0d8e1 (diff) | |
| download | node-new-1854ba04e9a68f062beb299dd6e1479279b26363.tar.gz | |
deps: update V8 to 6.3.292.46
PR-URL: https://github.com/nodejs/node/pull/16271
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/v8/src/builtins/builtins-conversion-gen.cc')
| -rw-r--r-- | deps/v8/src/builtins/builtins-conversion-gen.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/deps/v8/src/builtins/builtins-conversion-gen.cc b/deps/v8/src/builtins/builtins-conversion-gen.cc index b897c4dc63..c61ea70cf4 100644 --- a/deps/v8/src/builtins/builtins-conversion-gen.cc +++ b/deps/v8/src/builtins/builtins-conversion-gen.cc @@ -312,7 +312,7 @@ TF_BUILTIN(ToInteger, CodeStubAssembler) { // ES6 section 7.1.13 ToObject (argument) TF_BUILTIN(ToObject, CodeStubAssembler) { - Label if_number(this, Label::kDeferred), if_notsmi(this), if_jsreceiver(this), + Label if_smi(this, Label::kDeferred), if_jsreceiver(this), if_noconstructor(this, Label::kDeferred), if_wrapjsvalue(this); Node* context = Parameter(Descriptor::kContext); @@ -321,13 +321,9 @@ TF_BUILTIN(ToObject, CodeStubAssembler) { VARIABLE(constructor_function_index_var, MachineType::PointerRepresentation()); - Branch(TaggedIsSmi(object), &if_number, &if_notsmi); + GotoIf(TaggedIsSmi(object), &if_smi); - BIND(&if_notsmi); Node* map = LoadMap(object); - - GotoIf(IsHeapNumberMap(map), &if_number); - Node* instance_type = LoadMapInstanceType(map); GotoIf(IsJSReceiverInstanceType(instance_type), &if_jsreceiver); @@ -338,7 +334,7 @@ TF_BUILTIN(ToObject, CodeStubAssembler) { constructor_function_index_var.Bind(constructor_function_index); Goto(&if_wrapjsvalue); - BIND(&if_number); + BIND(&if_smi); constructor_function_index_var.Bind( IntPtrConstant(Context::NUMBER_FUNCTION_INDEX)); Goto(&if_wrapjsvalue); |