-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Optimize js_util getProperty calls to lowered call to native JS.
No change in the generated JavaScript for dart2js based on both a small foo.dart sample file and tests/lib/js/js_util/properties_test.dart All changes in generated JavaScript for DDC are smaller and clearer: - foo.dart: https://paste.googleplex.com/4738045023617024 - properties_test.dart: https://paste.googleplex.com/5107699705446400 Bug: #44533 Change-Id: I670f0226fbef90d05a95c51d918831bea58d6aa3 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/187840 Commit-Queue: Riley Porter <rileyporter@google.com> Reviewed-by: Sigmund Cherem <sigmund@google.com> Reviewed-by: Srujan Gaddam <srujzs@google.com>
- Loading branch information
1 parent
7aaf620
commit bfaf674
Showing
5 changed files
with
110 additions
and
0 deletions.
There are no files selected for viewing
54 changes: 54 additions & 0 deletions
54
pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
// Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file | ||
// for details. All rights reserved. Use of this source code is governed by a | ||
// BSD-style license that can be found in the LICENSE file. | ||
|
||
import 'package:kernel/ast.dart'; | ||
import 'package:kernel/core_types.dart'; | ||
import 'package:kernel/kernel.dart'; | ||
|
||
/// Replaces js_util methods with inline calls to foreign_helper JS which | ||
/// emits the code as a JavaScript code fragment. | ||
class JsUtilOptimizer extends Transformer { | ||
final Procedure _jsTarget; | ||
final Procedure _getPropertyTarget; | ||
|
||
JsUtilOptimizer(CoreTypes coreTypes) | ||
: _jsTarget = | ||
coreTypes.index.getTopLevelMember('dart:_foreign_helper', 'JS'), | ||
_getPropertyTarget = | ||
coreTypes.index.getTopLevelMember('dart:js_util', 'getProperty') {} | ||
|
||
/// Replaces js_util method calls with lowering straight to JS fragment call. | ||
/// | ||
/// Lowers the following types of js_util calls: | ||
/// - `getProperty` for any argument types | ||
@override | ||
visitStaticInvocation(StaticInvocation node) { | ||
if (node.target == _getPropertyTarget) { | ||
node = _lowerGetProperty(node); | ||
} | ||
node.transformChildren(this); | ||
return node; | ||
} | ||
|
||
/// Lowers the given js_util `getProperty` call to the foreign_helper JS call | ||
/// for any argument type. Lowers `getProperty(o, name)` to | ||
/// `JS('Object|Null', '#.#', o, name)`. | ||
StaticInvocation _lowerGetProperty(StaticInvocation node) { | ||
Arguments args = node.arguments; | ||
assert(args.positional.length == 2); | ||
return StaticInvocation( | ||
_jsTarget, | ||
Arguments( | ||
[ | ||
StringLiteral("Object|Null"), | ||
StringLiteral("#.#"), | ||
args.positional.first, | ||
args.positional.last | ||
], | ||
// TODO(rileyporter): Copy type from getProperty when it's generic. | ||
types: [DynamicType()], | ||
)) | ||
..fileOffset = node.fileOffset; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters