Skip to content

Commit 3ea8cc6

Browse files
committed
deps: V8: cherry-pick c721203
Original commit message: Add missing null condition in Proxy GetPrototypeof Bug: v8:9781 Change-Id: I1f82a828f103cc2aa3f9553214f6b4867ffc3b17 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1829897 Commit-Queue: Z Nguyen-Huu <duongn@microsoft.com> Reviewed-by: Georg Neis <neis@chromium.org> Cr-Commit-Position: refs/heads/master@{#64049} Refs: v8/v8@c721203 Fixes: #29730 PR-URL: #30065 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent d78978f commit 3ea8cc6

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.13',
41+
'v8_embedder_string': '-node.14',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/src/builtins/proxy-get-prototype-of.tq

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace proxy {
3333

3434
// 8. If Type(handlerProto) is neither Object nor Null, throw a TypeError
3535
// exception.
36-
if (!Is<JSReceiver>(handlerProto)) {
36+
if (!Is<JSReceiver>(handlerProto) && handlerProto != Null) {
3737
goto ThrowProxyGetPrototypeOfInvalid;
3838
}
3939

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright 2019 the V8 project authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
var proto = Object.getPrototypeOf(new Proxy(Object.create(null), {
6+
getPrototypeOf(target) {
7+
return Reflect.getPrototypeOf(target);
8+
}
9+
} ));
10+
11+
assertEquals(proto, null);

0 commit comments

Comments
 (0)