languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-02 23:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a generic return type for js_util functions

Browse source 
Allows further optimization to pass along return type
information and remove extra AsExpression casts.

Change-Id: I87aef171887e3f9af4c80003ff284eb2503d0cdb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/214460
Reviewed-by: Srujan Gaddam <srujzs@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Commit-Queue: Riley Porter <rileyporter@google.com>
This commit is contained in:
Riley Porter 2021-09-30 17:13:49 +00:00 committed by commit-bot@chromium.org
parent fc7bb0db54
commit 46486cf260
2 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart
View file

@ -138,6 +138,8 @@ class JsUtilOptimizer extends Transformer {
Arguments([
VariableGet(function.positionalParameters.first),
StringLiteral(_getExtensionMemberName(node))
], types: [
DynamicType()
]))
..fileOffset = node.fileOffset;
return ReturnStatement(
@ -157,6 +159,8 @@ class JsUtilOptimizer extends Transformer {
VariableGet(function.positionalParameters.first),
StringLiteral(_getExtensionMemberName(node)),
VariableGet(function.positionalParameters.last)
], types: [
DynamicType()
]))
..fileOffset = node.fileOffset;
return ReturnStatement(AsExpression(
@ -178,6 +182,8 @@ class JsUtilOptimizer extends Transformer {
.sublist(1)
.map((argument) => VariableGet(argument))
.toList())
], types: [
DynamicType()
]))
..fileOffset = node.fileOffset;
return ReturnStatement(AsExpression(
@ -224,7 +230,6 @@ class JsUtilOptimizer extends Transformer {
/// Removing the checks allows further inlining by the compilers.
StaticInvocation _lowerSetProperty(StaticInvocation node) {
Arguments arguments = node.arguments;
assert(arguments.types.isEmpty);
assert(arguments.positional.length == 3);
assert(arguments.named.isEmpty);
@ -244,7 +249,6 @@ class JsUtilOptimizer extends Transformer {
/// Removing the checks allows further inlining by the compilers.
StaticInvocation _lowerCallMethod(StaticInvocation node) {
Arguments arguments = node.arguments;
assert(arguments.types.isEmpty);
assert(arguments.positional.length == 3);
assert(arguments.named.isEmpty);
@ -260,7 +264,6 @@ class JsUtilOptimizer extends Transformer {
/// Removing the checks allows further inlining by the compilers.
StaticInvocation _lowerCallConstructor(StaticInvocation node) {
Arguments arguments = node.arguments;
assert(arguments.types.isEmpty);
assert(arguments.positional.length == 2);
assert(arguments.named.isEmpty);
@ -283,8 +286,13 @@ class JsUtilOptimizer extends Transformer {
// Lower arguments in a List.empty factory call.
if (argumentsList is StaticInvocation &&
argumentsList.target == _listEmptyFactory) {
return _createCallUncheckedNode(callUncheckedTargets, [],
originalArguments, node.fileOffset, node.arguments.fileOffset);
return _createCallUncheckedNode(
callUncheckedTargets,
node.arguments.types,
[],
originalArguments,
node.fileOffset,
node.arguments.fileOffset);
}
// Lower arguments in other kinds of Lists.
@ -323,6 +331,7 @@ class JsUtilOptimizer extends Transformer {
return _createCallUncheckedNode(
callUncheckedTargets,
node.arguments.types,
callUncheckedArguments,
originalArguments,
node.fileOffset,
@ -333,6 +342,7 @@ class JsUtilOptimizer extends Transformer {
/// with the given 0-4 arguments.
StaticInvocation _createCallUncheckedNode(
List<Procedure> callUncheckedTargets,
List<DartType> callUncheckedTypes,
List<Expression> callUncheckedArguments,
List<Expression> originalArguments,
int nodeFileOffset,
@ -342,7 +352,7 @@ class JsUtilOptimizer extends Transformer {
callUncheckedTargets[callUncheckedArguments.length],
Arguments(
[...originalArguments, ...callUncheckedArguments],
types: [],
types: callUncheckedTypes,
)..fileOffset = argumentsFileOffset)
..fileOffset = nodeFileOffset;
}

40
sdk/lib/js_util/js_util.dart
View file

@ -30,11 +30,11 @@ import 'dart:_js_helper'
/// converted into arrays. Strings, numbers, bools, and `@JS()` annotated
/// objects are passed through unmodified. Dart objects are also passed through
/// unmodified, but their members aren't usable from JavaScript.
dynamic jsify(Object object) {
T jsify<T>(Object object) {
if ((object is! Map) && (object is! Iterable)) {
throw ArgumentError("object must be a Map or Iterable");
}
return _convertDataTree(object);
return _convertDataTree(object) as T;
}
Object _convertDataTree(Object data) {
@ -64,65 +64,63 @@ Object _convertDataTree(Object data) {
return _convert(data)!;
}
dynamic newObject() => JS('=Object', '{}');
T newObject<T>() => JS('=Object', '{}');
bool hasProperty(Object o, Object name) => JS('bool', '# in #', name, o);
// A CFE transformation will optimize all calls to `getProperty`.
dynamic getProperty(Object o, Object name) =>
JS('Object|Null', '#[#]', o, name);
T getProperty<T>(Object o, Object name) => JS('Object|Null', '#[#]', o, name);
// A CFE transformation may optimize calls to `setProperty`, when [value] is
// statically known to be a non-function.
dynamic setProperty(Object o, Object name, Object? value) {
T setProperty<T>(Object o, Object name, T? value) {
assertInterop(value);
return JS('', '#[#]=#', o, name, value);
}
/// Unchecked version of setProperty, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _setPropertyUnchecked(Object o, Object name, Object? value) {
T _setPropertyUnchecked<T>(Object o, Object name, T? value) {
return JS('', '#[#]=#', o, name, value);
}
// A CFE transformation may optimize calls to `callMethod` when [args] is a
// a list literal or const list containing at most 4 values, all of which are
// statically known to be non-functions.
dynamic callMethod(Object o, String method, List<Object?> args) {
T callMethod<T>(Object o, String method, List<Object?> args) {
assertInteropArgs(args);
return JS('Object|Null', '#[#].apply(#, #)', o, method, o, args);
}
/// Unchecked version for 0 arguments, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callMethodUnchecked0(Object o, String method) {
T _callMethodUnchecked0<T>(Object o, String method) {
return JS('Object|Null', '#[#]()', o, method);
}
/// Unchecked version for 1 argument, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callMethodUnchecked1(Object o, String method, Object? arg1) {
T _callMethodUnchecked1<T>(Object o, String method, Object? arg1) {
return JS('Object|Null', '#[#](#)', o, method, arg1);
}
/// Unchecked version for 2 arguments, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callMethodUnchecked2(
T _callMethodUnchecked2<T>(
Object o, String method, Object? arg1, Object? arg2) {
return JS('Object|Null', '#[#](#, #)', o, method, arg1, arg2);
}
/// Unchecked version for 3 arguments, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callMethodUnchecked3(
T _callMethodUnchecked3<T>(
Object o, String method, Object? arg1, Object? arg2, Object? arg3) {
return JS('Object|Null', '#[#](#, #, #)', o, method, arg1, arg2, arg3);
}
/// Unchecked version for 4 arguments, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callMethodUnchecked4(Object o, String method, Object? arg1,
Object? arg2, Object? arg3, Object? arg4) {
T _callMethodUnchecked4<T>(Object o, String method, Object? arg1, Object? arg2,
Object? arg3, Object? arg4) {
return JS(
'Object|Null', '#[#](#, #, #, #)', o, method, arg1, arg2, arg3, arg4);
}
@ -134,7 +132,7 @@ dynamic _callMethodUnchecked4(Object o, String method, Object? arg1,
bool instanceof(Object? o, Object type) =>
JS('bool', '# instanceof #', o, type);
dynamic callConstructor(Object constr, List<Object?>? arguments) {
T callConstructor<T>(Object constr, List<Object?>? arguments) {
if (arguments == null) {
return JS('Object', 'new #()', constr);
} else {
@ -197,32 +195,32 @@ dynamic callConstructor(Object constr, List<Object?>? arguments) {
/// Unchecked version for 0 arguments, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callConstructorUnchecked0(Object constr) {
T _callConstructorUnchecked0<T>(Object constr) {
return JS('Object', 'new #()', constr);
}
/// Unchecked version for 1 argument, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callConstructorUnchecked1(Object constr, Object? arg1) {
T _callConstructorUnchecked1<T>(Object constr, Object? arg1) {
return JS('Object', 'new #(#)', constr, arg1);
}
/// Unchecked version for 2 arguments, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callConstructorUnchecked2(Object constr, Object? arg1, Object? arg2) {
T _callConstructorUnchecked2<T>(Object constr, Object? arg1, Object? arg2) {
return JS('Object', 'new #(#, #)', constr, arg1, arg2);
}
/// Unchecked version for 3 arguments, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callConstructorUnchecked3(
T _callConstructorUnchecked3<T>(
Object constr, Object? arg1, Object? arg2, Object? arg3) {
return JS('Object', 'new #(#, #, #)', constr, arg1, arg2, arg3);
}
/// Unchecked version for 4 arguments, only used in a CFE transformation.
@pragma('dart2js:tryInline')
dynamic _callConstructorUnchecked4(
T _callConstructorUnchecked4<T>(
Object constr, Object? arg1, Object? arg2, Object? arg3, Object? arg4) {
return JS('Object', 'new #(#, #, #, #)', constr, arg1, arg2, arg3, arg4);
}