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

Don't use '.type' in TypeParameterMember.

Browse source 
R=brianwilkerson@google.com

Change-Id: Icd481da622f226aa0e12c0f1f91820ce6c3a0537
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/118889
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2019-09-26 17:19:42 +00:00 committed by commit-bot@chromium.org
parent 3c18db7d9e
commit 38a3a6b6cb
2 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkg/analyzer/lib/src/dart/element/member.dart
View file

@ -941,7 +941,7 @@ class TypeParameterMember extends Member implements TypeParameterElement {
TypeParameterType instantiate({
@required NullabilitySuffix nullabilitySuffix,
}) {
return baseElement.instantiate(nullabilitySuffix: nullabilitySuffix);
return TypeParameterTypeImpl(this, nullabilitySuffix: nullabilitySuffix);
}
@override
@ -968,37 +968,39 @@ class TypeParameterMember extends Member implements TypeParameterElement {
}
static List<TypeParameterElement> from2(
List<TypeParameterElement> formals,
List<TypeParameterElement> elements,
MapSubstitution substitution,
) {
if (substitution.map.isEmpty) {
return formals;
return elements;
}
// Create type formals with specialized bounds.
// For example `<U extends T>` where T comes from an outer scope.
var newElements = formals.toList(growable: false);
var newTypes = List<TypeParameterType>(formals.length);
var newElements = List<TypeParameterElement>(elements.length);
var newTypes = List<TypeParameterType>(elements.length);
for (int i = 0; i < newElements.length; i++) {
var formal = newElements[i];
DartType bound = formal?.bound;
var element = elements[i];
var bound = element?.bound;
if (bound != null) {
bound = substitution.substituteType(bound);
var member = TypeParameterMember(formal, substitution, bound);
newElements[i] = member;
element = TypeParameterMember(element, substitution, bound);
}
newTypes[i] = newElements[i].type;
newElements[i] = element;
newTypes[i] = newElements[i].instantiate(
nullabilitySuffix: NullabilitySuffix.none,
);
}
// Recursive bounds are allowed too, so make sure these are updated
// to refer to any new TypeParameterMember we just made, rather than
// the original type parameter
var substitution2 = Substitution.fromPairs(formals, newTypes);
for (var formal in newElements) {
if (formal is TypeParameterMember) {
var substitution2 = Substitution.fromPairs(elements, newTypes);
for (var newElement in newElements) {
if (newElement is TypeParameterMember) {
// TODO(jmesserly): this is required so substituting for the
// type formal will work. Investigate if there's a better solution.
formal._bound = substitution2.substituteType(formal.bound);
newElement._bound = substitution2.substituteType(newElement.bound);
}
}
return newElements;

11
pkg/analyzer/lib/src/dart/element/type_algebra.dart
View file

@ -191,17 +191,6 @@ class _FreshTypeParametersSubstitutor extends _TypeSubstitutor {
_FreshTypeParametersSubstitutor(_TypeSubstitutor outer) : super(outer);
TypeParameterElement freshTypeParameter(TypeParameterElement element) {
var freshElement = new TypeParameterElementImpl(element.name, -1);
var freshType = new TypeParameterTypeImpl(freshElement);
freshElement.type = freshType;
substitution[element] = freshType;
if (element.bound != null) {
freshElement.bound = visit(element.bound);
}
return freshElement;
}
@override
List<TypeParameterElement> freshTypeParameters(
List<TypeParameterElement> elements) {