languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 09:43:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ddc] Add types to super.method tearoffs

Browse source 
Helper methods for locations in constructors (`super` not available)
were missing type information for the tearoff. This replaces the use
of a helper that would itself would be torn off.

Added a new form of helper method that performs the tearoff and
binds the type. NOTE: Generic type arguments are still applied
outside of the helper.

Change-Id: I8dafe0d8357ecc9e1d070046a82e9e83e1a16ed9
Fixes: https://github.com/dart-lang/sdk/issues/47175
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/212861
Commit-Queue: Nicholas Shahan <nshahan@google.com>
Reviewed-by: Mark Zhou <markzipan@google.com>
This commit is contained in:
Nicholas Shahan 2021-09-13 19:50:59 +00:00 committed by commit-bot@chromium.org
parent 700969604a
commit 58416605e2
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkg/dev_compiler/lib/src/kernel/compiler.dart
View file

@ -4695,11 +4695,15 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
@override
js_ast.Expression visitSuperPropertyGet(SuperPropertyGet node) {
var target = node.interfaceTarget;
var jsTarget = _emitSuperTarget(target);
if (_reifyTearoff(target)) {
return runtimeCall('bind(this, #, #)', [jsTarget.selector, jsTarget]);
if (_superAllowed) {
var jsTarget = _emitSuperTarget(target);
return runtimeCall('bind(this, #, #)', [jsTarget.selector, jsTarget]);
} else {
return _emitSuperTearoff(target);
}
}
return jsTarget;
return _emitSuperTarget(target);
}
@override
@ -5318,6 +5322,10 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
// If we can't emit `super` in this context, generate a helper that does it
// for us, and call the helper.
//
// NOTE: This is intended to help in the cases of calling a `super` getter,
// setter, or method. For the case of tearing off a `super` method in
// contexts where `super` isn't allowed, see [_emitSuperTearoff].
var name = member.name.text;
var jsMethod = _superHelpers.putIfAbsent(name, () {
var isAccessor = member is Procedure ? member.isAccessor : true;
@ -5351,6 +5359,25 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
return js_ast.PropertyAccess(js_ast.This(), jsMethod.name);
}
/// Generates a helper method that is inserted into the class that binds a
/// tearoff of [member] from `super` and returns a call to the helper.
///
/// This method assumes `super` is not allowed in the current context.
// TODO(nshahan) Replace with a kernel transform and synthetic method filters
// for devtools.
js_ast.Expression _emitSuperTearoff(Member member) {
var jsName = _emitMemberName(member.name.text, member: member);
var name = '_#super#tearOff#${member.name.text}';
var jsMethod = _superHelpers.putIfAbsent(name, () {
var jsReturnValue =
runtimeCall('bind(this, #, super[#])', [jsName, jsName]);
var fn = js.fun('function() { return #; }', [jsReturnValue]);
name = js_ast.friendlyNameForDartOperator[name] ?? name;
return js_ast.Method(_emitTemporaryId(name), fn);
});
return js_ast.Call(js_ast.PropertyAccess(js_ast.This(), jsMethod.name), []);
}
/// If [e] is a [TypeLiteral] or a [TypeLiteralConstant] expression, return
/// the underlying [DartType], otherwise returns null.
// TODO(sigmund,nshahan): remove all uses of type literals in the runtime