Skip to content

Commit

Permalink
Version 3.3.0-247.0.dev
Browse files Browse the repository at this point in the history 
Merge 1f109d1 into dev
  • Loading branch information
Dart CI committed Dec 20, 2023
2 parents ed415d9 + 1f109d1 commit 97c3b7e
Show file tree
Hide file tree
Showing 97 changed files with 6,377 additions and 99 deletions.
157 changes: 129 additions & 28 deletions pkg/_fe_analyzer_shared/lib/src/exhaustiveness/shared.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ abstract class TypeOperations<Type extends Object> {
/// replacing all type variables with the default types.
Type overapproximate(Type type);

/// Returns `true` if [type] is a potentially nullable type.
/// Returns `true` if [type] is a nullable type.
bool isNullable(Type type);

/// Returns `true` if [type] is a potentially nullable type.
bool isPotentiallyNullable(Type type);

/// Returns the non-nullable type corresponding to [type]. For instance
/// `Foo` for `Foo?`. If [type] is already non-nullable, it itself is
/// returned.
Expand Down Expand Up @@ -351,6 +354,10 @@ mixin SpaceCreator<Pattern extends Object, Type extends Object> {

ObjectPropertyLookup get objectFieldLookup;

/// Returns `true` if the current library has version greater than or equal
/// to `$major.$minor`.
bool hasLanguageVersion(int major, int minor);

/// Creates a [StaticType] for an unknown type.
///
/// This is used when the type of the pattern is unknown or can't be
Expand Down Expand Up @@ -504,6 +511,76 @@ mixin SpaceCreator<Pattern extends Object, Type extends Object> {
return createUnknownSpace(path);
}

/// Returns `true` if [singleSpace] does not restrict the spaces of any of its
/// properties. For instance the pattern `Object(:int hashCode)` is
/// unrestricted but the pattern `Object(hashCode: 5)` is restricted.
bool _isUnrestricted(SingleSpace singleSpace) {
if (singleSpace.properties.isNotEmpty) {
Map<Key, StaticType> fieldTypes = singleSpace.type.fields;
for (MapEntry<Key, Space> entry in singleSpace.properties.entries) {
Key key = entry.key;
StaticType fieldType = fieldTypes[key] ?? StaticType.neverType;
if (!_isContainedIn(fieldType, entry.value)) {
return false;
}
}
}
if (singleSpace.additionalProperties.isNotEmpty) {
for (MapEntry<Key, Space> entry
in singleSpace.additionalProperties.entries) {
Key key = entry.key;
StaticType fieldType =
singleSpace.type.getAdditionalPropertyType(key) ??
StaticType.neverType;
if (!_isContainedIn(fieldType, entry.value)) {
return false;
}
}
}
return true;
}

/// Returns `true` if the space implied by [type], i.e. all values of [type]
/// regardless of properties, is contained in [space].
bool _isContainedIn(StaticType type, Space space) {
Map<SingleSpace, bool> unrestrictedCache = {};
if (space.singleSpaces.length == 1) {
// Optimize for simple spaces to avoid unnecessary expansion of subtypes.
SingleSpace singleSpace = space.singleSpaces.single;
bool isUnrestricted =
unrestrictedCache[singleSpace] ??= _isUnrestricted(singleSpace);
if (isUnrestricted && type.isSubtypeOf(singleSpace.type)) {
return true;
}
}
// To handle case like:
//
// sealed class M {}
// class A extends M {}
// class B extends M {}
// method(o) => switch (o) {
// (A() || B()) as M => 0,
// };
//
// we expand [type] into subtypes before determining for containment.
List<StaticType> subtypes = expandSealedSubtypes(type, const {});
for (StaticType subtype in subtypes) {
bool found = false;
for (SingleSpace singleSpace in space.singleSpaces) {
bool isUnrestricted =
unrestrictedCache[singleSpace] ??= _isUnrestricted(singleSpace);
if (isUnrestricted && subtype.isSubtypeOf(singleSpace.type)) {
found = true;
break;
}
}
if (!found) {
return false;
}
}
return true;
}

/// Creates the [Space] at [path] for a cast pattern with the given
/// [subPattern].
///
Expand All @@ -514,34 +591,58 @@ mixin SpaceCreator<Pattern extends Object, Type extends Object> {
Space space =
dispatchPattern(path, contextType, subPattern, nonNull: nonNull);
StaticType castType = createStaticType(type);
if (castType.isSubtypeOf(contextType) && contextType.isSealed) {
for (StaticType subtype in expandSealedSubtypes(contextType, const {})) {
// If [subtype] is a subtype of [castType] it will not throw and must
// be handled by [subPattern]. For instance
//
// sealed class S {}
// sealed class X extends S {}
// class A extends X {}
// method(S s) => switch (s) {
// A() as X => 0,
// }
if (hasLanguageVersion(3, 3)) {
if (_isContainedIn(castType, space)) {
// If all values in [castType] are also in [space] then the complete
// [contextType] is matched. For instance
//
// If [castType] is a subtype of [subtype] it might not throw but still
// not handle all values of the [subtype].
//
// sealed class S {}
// class A extends S {}
// class X extends A {
// int field;
// X(this.field);
// }
// method(S s) => switch (s) {
// X(field: 42) as X => 0,
// }
//
if (!castType.isSubtypeOf(subtype) && !subtype.isSubtypeOf(castType)) {
// Otherwise the cast implicitly handles [subtype].
space = space.union(new Space(path, subtype));
// method(var d) => switch (d) {
// final String value => value,
// // This covers everything either by matching as int or by
// // throwing.
// final value as int => value,
// };
space = new Space(path, contextType);
}
if (!typeOperations.isPotentiallyNullable(type)) {
// If `null` is _not_ included in [castType], we can include in the
// generated [space].
space = space.union(new Space(path, StaticType.nullType));
}
} else {
// The following check assumes that the subpattern space is
// unrestrictive.
if (castType.isSubtypeOf(contextType) && contextType.isSealed) {
for (StaticType subtype
in expandSealedSubtypes(contextType, const {})) {
// If [subtype] is a subtype of [castType] it will not throw and
// must be handled by [subPattern]. For instance
//
// sealed class S {}
// sealed class X extends S {}
// class A extends X {}
// method(S s) => switch (s) {
// A() as X => 0,
// }
//
// If [castType] is a subtype of [subtype] it might not throw but
// still not handle all values of the [subtype].
//
// sealed class S {}
// class A extends S {}
// class X extends A {
// int field;
// X(this.field);
// }
// method(S s) => switch (s) {
// X(field: 42) as X => 0,
// }
//
if (!castType.isSubtypeOf(subtype) &&
!subtype.isSubtypeOf(castType)) {
// Otherwise the cast implicitly handles [subtype].
space = space.union(new Space(path, subtype));
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/_fe_analyzer_shared/lib/src/exhaustiveness/test_helper.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Tags {
/// Returns a textual representation for [space] used for testing.
String spacesToText(Space space) {
String text = space.toString();
if (text.startsWith('[') && text.endsWith(']')) {
if (text.startsWith('[') && (text.endsWith(']') || text.endsWith(']?'))) {
// Avoid list-like syntax which collides with the [Features] encoding.
return '<$text>';
}
Expand Down
17 changes: 3 additions & 14 deletions pkg/_fe_analyzer_shared/lib/src/macros/compiler/request_channel.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,9 @@ import 'dart:io';
import 'dart:typed_data';

import 'package:_fe_analyzer_shared/src/macros/executor/message_grouper.dart';
import 'package:_fe_analyzer_shared/src/macros/executor/protocol.dart';
import 'package:_fe_analyzer_shared/src/macros/executor/serialization.dart';

/// An instance of this class is thrown when remotely executed code throws
/// an exception.
class RemoteException {
final String message;
final String stackTrace;

RemoteException({
required this.message,
required this.stackTrace,
});
}

/// Channel for exchanging requests and responses over [Socket].
class RequestChannel {
final Socket _socket;
Expand Down Expand Up @@ -115,8 +104,8 @@ class RequestChannel {
if (exception is Map) {
completer.completeError(
new RemoteException(
message: exception['message'] as String,
stackTrace: exception['stackTrace'] as String,
exception['message'] as String,
exception['stackTrace'] as String,
),
);
return;
Expand Down
Loading

0 comments on commit 97c3b7e

Please sign in to comment.