languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-20 18:05:01 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[js_runtime/js_dev_runtime] Prefer Array.isArray over checking prototype

Browse source 
Closes https://github.com/dart-lang/sdk/pull/54990

GitOrigin-RevId: 9c51a86c10e70c5f92e8b72894f8d3de138cd17b
Change-Id: I4b74f3762ec720b0204331d0945da046be99ba33
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/353784
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Reviewed-by: Stephen Adams <sra@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>
This commit is contained in:
Matthew Berry 2024-02-26 20:33:49 +00:00 committed by Commit Queue
parent 792d5005f5
commit 4bea796167
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart
View file

@ -54,10 +54,7 @@ _convertJsonToDart(json, reviver(Object? key, Object? value)) {
return e;
}
// This test is needed to avoid identifying '{"__proto__":[]}' as an Array.
// TODO(sra): Replace this test with cheaper '#.constructor === Array' when
// bug 621 below is fixed.
if (JS<bool>('!', 'Object.getPrototypeOf(#) === Array.prototype', e)) {
if (JS<bool>('!', 'Array.isArray(#)', e)) {
// In-place update of the elements since JS Array is a Dart List.
for (int i = 0; i < JS<int>('!', '#.length', e); i++) {
// Use JS indexing to avoid range checks. We know this is the only
@ -99,10 +96,7 @@ _convertJsonToDartLazy(object) {
return object;
}
// This test is needed to avoid identifying '{"__proto__":[]}' as an array.
// TODO(sra): Replace this test with cheaper '#.constructor === Array' when
// bug https://code.google.com/p/v8/issues/detail?id=621 is fixed.
if (JS<bool>('!', 'Object.getPrototypeOf(#) !== Array.prototype', object)) {
if (JS<bool>('!', '!Array.isArray(#)', object)) {
return _JsonMap(object);
}

11
sdk/lib/_internal/js_runtime/lib/convert_patch.dart
View file

@ -54,10 +54,7 @@ _convertJsonToDart(json, reviver(Object? key, Object? value)) {
return e;
}
// This test is needed to avoid identifying '{"__proto__":[]}' as an Array.
// TODO(sra): Replace this test with cheaper '#.constructor === Array' when
// bug 621 below is fixed.
if (JS<bool>('bool', 'Object.getPrototypeOf(#) === Array.prototype', e)) {
if (JS<bool>('bool', 'Array.isArray(#)', e)) {
// In-place update of the elements since JS Array is a Dart List.
for (int i = 0; i < JS<int>('int', '#.length', e); i++) {
// Use JS indexing to avoid range checks. We know this is the only
@ -99,11 +96,7 @@ _convertJsonToDartLazy(object) {
return object;
}
// This test is needed to avoid identifying '{"__proto__":[]}' as an array.
// TODO(sra): Replace this test with cheaper '#.constructor === Array' when
// bug https://code.google.com/p/v8/issues/detail?id=621 is fixed.
if (JS<bool>(
'bool', 'Object.getPrototypeOf(#) !== Array.prototype', object)) {
if (JS<bool>('bool', '!Array.isArray(#)', object)) {
return _JsonMap(object);
}