sdk/lib/_internal/compiler/implementation/dart_types.dart - Issue 267153002: Support general handling of type variables by substituting types into the current context.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sdk/lib/_internal/compiler/implementation/dart_types.dart

Issue 267153002: Support general handling of type variables by substituting types into the current context. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « sdk/lib/_internal/compiler/implementation/dart2jslib.dart ('k') | sdk/lib/_internal/compiler/implementation/elements/elements.dart » ('j') | sdk/lib/_internal/compiler/implementation/elements/elements.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/dart_types.dart

diff --git a/sdk/lib/_internal/compiler/implementation/dart_types.dart b/sdk/lib/_internal/compiler/implementation/dart_types.dart

index 17794f9d6e79c8e6bddda99321484c5ffbf00220..c59029c55ed28e210f9e4a02b1db97481b48c87a 100644

--- a/sdk/lib/_internal/compiler/implementation/dart_types.dart

+++ b/sdk/lib/_internal/compiler/implementation/dart_types.dart

@@ -485,14 +485,12 @@ class InterfaceType extends GenericType {

DartType asInstanceOf(ClassElement other) {

other = other.declaration;

if (element == other) return this;

- for (InterfaceType supertype in element.allSupertypes) {

- ClassElement superclass = supertype.element;

- if (superclass == other) {

- Link<DartType> arguments = Types.substTypes(supertype.typeArguments,

- typeArguments,

- element.typeVariables);

- return new InterfaceType(superclass, arguments);

- }

+ InterfaceType supertype = element.asInstanceOf(other);

+ if (supertype != null) {

+ Link<DartType> arguments = Types.substTypes(supertype.typeArguments,

+ typeArguments,

+ element.typeVariables);

+ return new InterfaceType(supertype.element, arguments);

}

return null;

}