Skip to content

Commit

Permalink
Version 3.3.0-107.0.dev
Browse files Browse the repository at this point in the history
Merge cd26cee into dev
  • Loading branch information
Dart CI committed Nov 8, 2023
2 parents c9553a0 + cd26cee commit 1493304
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 27 deletions.
4 changes: 0 additions & 4 deletions pkg/dart2wasm/lib/code_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -813,12 +813,8 @@ class CodeGenerator extends ExpressionVisitor1<w.ValueType, w.ValueType>
// Dart body may have an implicit return null.
b.ref_null(returnType.heapType.bottomType);
} else {
// This point is unreachable, but the Wasm validator still expects the
// stack to contain a value matching the Wasm function return type.
b.block(const [], outputs);
b.comment("Unreachable implicit return");
b.unreachable();
b.end();
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import 'members_node.dart';
class ClassMembersBuilder implements ClassHierarchyMembers {
final ClassHierarchyBuilder hierarchyBuilder;

final Map<Class, ClassMembersNode> classNodes = {};
final Map<Class, ClassMembersNode> classNodes = new Map.identity();

final Map<ExtensionTypeDeclaration, ExtensionTypeMembersNode>
extensionTypeDeclarationNodes = {};
Expand Down
1 change: 1 addition & 0 deletions pkg/front_end/test/spell_checking_list_code.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,7 @@ pool
poorly
popped
pos
positionals
possibility
postfix
pound
Expand Down
44 changes: 23 additions & 21 deletions pkg/kernel/lib/ast.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3827,17 +3827,18 @@ class FunctionNode extends TreeNode {
if (typeParametersToCopy.isEmpty || reuseTypeParameters) {
structuralParameters = const <StructuralParameter>[];
returnType = this.returnType;
positionalParameters = this
.positionalParameters
.map(_getTypeOfVariable)
.toList(growable: false);
if (this.namedParameters.isEmpty) {
List<VariableDeclaration> thisPositionals = this.positionalParameters;
positionalParameters = List.generate(thisPositionals.length,
(index) => _getTypeOfVariable(thisPositionals[index]),
growable: false);

List<VariableDeclaration> thisNamed = this.namedParameters;
if (thisNamed.isEmpty) {
namedParameters = const <NamedType>[];
} else {
namedParameters = this
.namedParameters
.map(_getNamedTypeOfVariable)
.toList(growable: false);
namedParameters = List.generate(thisNamed.length,
(index) => _getNamedTypeOfVariable(thisNamed[index]),
growable: false);
namedParameters.sort();
}
} else {
Expand All @@ -3848,19 +3849,20 @@ class FunctionNode extends TreeNode {
structuralParameters = freshStructuralParameters.freshTypeParameters;
Substitution substitution = freshStructuralParameters.substitution;
returnType = substitution.substituteType(this.returnType);
positionalParameters = this
.positionalParameters
.map((VariableDeclaration parameter) =>
substitution.substituteType(_getTypeOfVariable(parameter)))
.toList(growable: false);
if (this.namedParameters.isEmpty) {

List<VariableDeclaration> thisPositionals = this.positionalParameters;
positionalParameters = List.generate(
thisPositionals.length,
(index) => substitution
.substituteType(_getTypeOfVariable(thisPositionals[index])),
growable: false);
List<VariableDeclaration> thisNamed = this.namedParameters;
if (thisNamed.isEmpty) {
namedParameters = const <NamedType>[];
} else {
namedParameters = this
.namedParameters
.map((VariableDeclaration parameter) =>
_getNamedTypeOfVariable(parameter, substitution))
.toList(growable: false);
namedParameters = List.generate(thisNamed.length,
(index) => _getNamedTypeOfVariable(thisNamed[index], substitution),
growable: false);
namedParameters.sort();
}
}
Expand Down Expand Up @@ -11248,7 +11250,7 @@ class DynamicType extends DartType {
DartType get nonTypeVariableBound => this;

@override
bool get hasNonObjectMemberAccess => true;
bool get hasNonObjectMemberAccess => false;

@override
bool equals(Object other, Assumptions? assumptions) => other is DynamicType;
Expand Down
2 changes: 1 addition & 1 deletion tools/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ CHANNEL dev
MAJOR 3
MINOR 3
PATCH 0
PRERELEASE 106
PRERELEASE 107
PRERELEASE_PATCH 0

0 comments on commit 1493304

Please sign in to comment.