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

[dart2wasm] Make type parameters available in async return types

Browse source 
Change-Id: I117647010dfe2f6b60b5124d99ad250af4a491be
Cq-Include-Trybots: luci.dart.try:dart2wasm-linux-x64-d8-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/258805
Reviewed-by: Joshua Litt <joshualitt@google.com>
Commit-Queue: Aske Simon Christensen <askesc@google.com>
This commit is contained in:
Aske Simon Christensen 2022-09-13 07:03:18 +00:00 committed by Commit Bot
parent 98055e5b86
commit 72797a3761
1 changed files with 64 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
pkg/dart2wasm/lib/code_generator.dart
View file

@ -127,6 +127,7 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
/// Generate code for the member.
void generate() {
// Build closure information.
closures = Closures(this);
Member member = this.member;
@ -168,7 +169,8 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
Procedure procedure = member as Procedure;
w.BaseFunction inner =
translator.functions.getFunction(procedure.asyncInnerReference);
return generateAsyncWrapper(procedure.function, inner);
int parameterOffset = _initializeThis(member);
return generateAsyncWrapper(procedure.function, inner, parameterOffset);
}
return generateBody(member);
@ -251,7 +253,8 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
///
/// The stub function unwraps the arguments from the struct and calls the
/// inner function, containing the implementation of the async function.
void generateAsyncWrapper(FunctionNode functionNode, w.BaseFunction inner) {
void generateAsyncWrapper(
FunctionNode functionNode, w.BaseFunction inner, int parameterOffset) {
w.DefinedFunction stub =
m.addFunction(translator.functions.asyncStubFunctionType);
w.BaseFunction asyncHelper =
@ -261,6 +264,13 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
w.Local stubArguments = stub.locals[0];
w.Local stubStack = stub.locals[1];
// Set up the type parameter to local mapping, in case a type parameter is
// used in the return type.
int paramIndex = parameterOffset;
for (TypeParameter typeParam in functionNode.typeParameters) {
typeLocals[typeParam] = paramLocals[paramIndex++];
}
// Push the type argument to the async helper, specifying the type argument
// of the returned `Future`.
DartType returnType = functionNode.returnType;
@ -312,9 +322,8 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
void generateBody(Member member) {
ParameterInfo paramInfo = translator.paramInfoFor(reference);
bool hasThis = member.isInstanceMember || member is Constructor;
int typeParameterOffset = hasThis ? 1 : 0;
int implicitParams = typeParameterOffset + paramInfo.typeParamCount;
int parameterOffset = _initializeThis(member);
int implicitParams = parameterOffset + paramInfo.typeParamCount;
List<VariableDeclaration> positional =
member.function!.positionalParameters;
for (int i = 0; i < positional.length; i++) {
@ -329,7 +338,7 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
? member.enclosingClass.typeParameters
: member.function!.typeParameters;
for (int i = 0; i < typeParameters.length; i++) {
typeLocals[typeParameters[i]] = paramLocals[typeParameterOffset + i];
typeLocals[typeParameters[i]] = paramLocals[parameterOffset + i];
}
// For all parameters whose Wasm type has been forced to `externref` due to
@ -349,27 +358,6 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
});
closures.findCaptures(member);
if (hasThis) {
Class cls = member.enclosingClass!;
ClassInfo info = translator.classInfo[cls]!;
thisLocal = paramLocals[0];
assert(!thisLocal!.type.nullable);
w.RefType thisType = info.nonNullableType;
if (translator.needsConversion(paramLocals[0].type, thisType) &&
!(cls == translator.objectInfo.cls ||
cls == translator.ffiPointerClass ||
translator.isFfiCompound(cls) ||
translator.isWasmType(cls))) {
preciseThisLocal = addLocal(thisType);
b.local_get(paramLocals[0]);
b.ref_cast(info.struct);
b.local_set(preciseThisLocal!);
} else {
preciseThisLocal = paramLocals[0];
}
}
closures.collectContexts(member);
if (member is Constructor) {
for (Field field in member.enclosingClass.fields) {
@ -418,18 +406,21 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
/// Generate code for the body of a lambda.
w.DefinedFunction generateLambda(Lambda lambda, Closures closures) {
// Initialize closure information from enclosing member.
this.closures = closures;
FunctionNode functionNode = lambda.functionNode;
_initializeContextLocals(functionNode);
if (functionNode.asyncMarker == AsyncMarker.Async &&
lambda.function == function) {
w.DefinedFunction inner =
translator.functions.addAsyncInnerFunctionFor(function);
generateAsyncWrapper(functionNode, inner);
generateAsyncWrapper(functionNode, inner, 1);
return CodeGenerator(translator, inner, reference)
.generateLambda(lambda, closures);
}
this.closures = closures;
int paramIndex = 1;
for (TypeParameter typeParam in functionNode.typeParameters) {
typeLocals[typeParam] = paramLocals[paramIndex++];
@ -441,6 +432,49 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
locals[param] = paramLocals[paramIndex++];
}
allocateContext(functionNode);
captureParameters();
visitStatement(functionNode.body!);
_implicitReturn();
b.end();
return function;
}
/// Initialize locals containing `this` in constructors and instance members.
/// Returns the number of parameter locals taken up by the receiver parameter,
/// i.e. the parameter offset for the first type parameter (or the first
/// parameter if there are no type parameters).
int _initializeThis(Member member) {
bool hasThis = member.isInstanceMember || member is Constructor;
if (hasThis) {
Class cls = member.enclosingClass!;
ClassInfo info = translator.classInfo[cls]!;
thisLocal = paramLocals[0];
assert(!thisLocal!.type.nullable);
w.RefType thisType = info.nonNullableType;
if (translator.needsConversion(paramLocals[0].type, thisType) &&
!(cls == translator.objectInfo.cls ||
cls == translator.ffiPointerClass ||
translator.isFfiCompound(cls) ||
translator.isWasmType(cls))) {
preciseThisLocal = addLocal(thisType);
b.local_get(paramLocals[0]);
b.ref_cast(info.struct);
b.local_set(preciseThisLocal!);
} else {
preciseThisLocal = paramLocals[0];
}
return 1;
}
return 0;
}
/// Initialize locals pointing to every context in the context chain of a
/// closure, plus the locals containing `this` if `this` is captured by the
/// closure.
void _initializeContextLocals(FunctionNode functionNode) {
Context? context = closures.contexts[functionNode]?.parent;
if (context != null) {
b.local_get(paramLocals[0]);
@ -470,14 +504,6 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
b.local_set(thisLocal!);
}
}
allocateContext(functionNode);
captureParameters();
visitStatement(functionNode.body!);
_implicitReturn();
b.end();
return function;
}
void _implicitReturn() {