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

[cfe] New invocation nodes for property access in collection transformer

Browse source 
Change-Id: Ie70706e8b00129d60910a96f8a9704067cd0752f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/200425
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Aske Simon Christensen <askesc@google.com>
This commit is contained in:
Aske Simon Christensen 2021-05-19 11:09:16 +00:00 committed by commit-bot@chromium.org
parent 7c9abd9faa
commit 99679b51d8
1 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
pkg/front_end/lib/src/fasta/kernel/transform_collections.dart
View file

@ -574,7 +574,7 @@ class CollectionTransformer extends Transformer {
List<Statement> body) {
Expression value = entry.expression.accept<TreeNode>(this);
final DartType entryType = new InterfaceType(_mapEntryClass,
final InterfaceType entryType = new InterfaceType(_mapEntryClass,
_currentLibrary.nonNullable, <DartType>[keyType, valueType]);
final bool typeMatches = entry.entryType != null &&
_typeEnvironment.isSubtypeOf(
@ -603,15 +603,15 @@ class CollectionTransformer extends Transformer {
VariableDeclaration keyVar = _createVariable(
_createImplicitAs(
entry.expression.fileOffset,
_createGetKey(
entry.expression.fileOffset, _createVariableGet(variable)),
_createGetKey(entry.expression.fileOffset,
_createVariableGet(variable), entryType),
keyType),
keyType);
VariableDeclaration valueVar = _createVariable(
_createImplicitAs(
entry.expression.fileOffset,
_createGetValue(
entry.expression.fileOffset, _createVariableGet(variable)),
_createGetValue(entry.expression.fileOffset,
_createVariableGet(variable), entryType),
valueType),
valueType);
loopBody = _createBlock(<Statement>[
@ -630,13 +630,13 @@ class CollectionTransformer extends Transformer {
entry.expression.fileOffset,
_createVariableGet(result),
receiverType,
_createGetKey(
entry.expression.fileOffset, _createVariableGet(variable)),
_createGetValue(
entry.expression.fileOffset, _createVariableGet(variable))));
_createGetKey(entry.expression.fileOffset,
_createVariableGet(variable), entryType),
_createGetValue(entry.expression.fileOffset,
_createVariableGet(variable), entryType)));
}
Statement statement = _createForInStatement(entry.fileOffset, variable,
_createGetEntries(entry.fileOffset, value), loopBody);
_createGetEntries(entry.fileOffset, value, receiverType), loopBody);
if (entry.isNullAware) {
statement = _createIf(
@ -1003,25 +1003,55 @@ class CollectionTransformer extends Transformer {
return new IfStatement(condition, then, otherwise)..fileOffset = fileOffset;
}
PropertyGet _createGetKey(int fileOffset, Expression receiver) {
Expression _createGetKey(
int fileOffset, Expression receiver, InterfaceType entryType) {
assert(fileOffset != null);
assert(fileOffset != TreeNode.noOffset);
return new PropertyGet(receiver, new Name('key'), _mapEntryKey)
..fileOffset = fileOffset;
if (useNewMethodInvocationEncoding) {
DartType resultType = Substitution.fromInterfaceType(entryType)
.substituteType(_mapEntryKey.type);
return new InstanceGet(
InstanceAccessKind.Instance, receiver, new Name('key'),
interfaceTarget: _mapEntryKey, resultType: resultType)
..fileOffset = fileOffset;
} else {
return new PropertyGet(receiver, new Name('key'), _mapEntryKey)
..fileOffset = fileOffset;
}
}
PropertyGet _createGetValue(int fileOffset, Expression receiver) {
Expression _createGetValue(
int fileOffset, Expression receiver, InterfaceType entryType) {
assert(fileOffset != null);
assert(fileOffset != TreeNode.noOffset);
return new PropertyGet(receiver, new Name('value'), _mapEntryValue)
..fileOffset = fileOffset;
if (useNewMethodInvocationEncoding) {
DartType resultType = Substitution.fromInterfaceType(entryType)
.substituteType(_mapEntryValue.type);
return new InstanceGet(
InstanceAccessKind.Instance, receiver, new Name('value'),
interfaceTarget: _mapEntryValue, resultType: resultType)
..fileOffset = fileOffset;
} else {
return new PropertyGet(receiver, new Name('value'), _mapEntryValue)
..fileOffset = fileOffset;
}
}
PropertyGet _createGetEntries(int fileOffset, Expression receiver) {
Expression _createGetEntries(
int fileOffset, Expression receiver, InterfaceType mapType) {
assert(fileOffset != null);
assert(fileOffset != TreeNode.noOffset);
return new PropertyGet(receiver, new Name('entries'), _mapEntries)
..fileOffset = fileOffset;
if (useNewMethodInvocationEncoding) {
DartType resultType = Substitution.fromInterfaceType(mapType)
.substituteType(_mapEntries.getterType);
return new InstanceGet(
InstanceAccessKind.Instance, receiver, new Name('entries'),
interfaceTarget: _mapEntries, resultType: resultType)
..fileOffset = fileOffset;
} else {
return new PropertyGet(receiver, new Name('entries'), _mapEntries)
..fileOffset = fileOffset;
}
}
ForStatement _createForStatement(