sdk/lib/_internal/compiler/implementation/inferrer/simple_types_inferrer.dart - Issue 304153014: Remove element from DynamicType.

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/inferrer/simple_types_inferrer.dart

Issue 304153014: Remove element from DynamicType. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Fix infinite loop. 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/inferrer/inferrer_visitor.dart ('k') | sdk/lib/_internal/compiler/implementation/inferrer/type_graph_inferrer.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/inferrer/simple_types_inferrer.dart

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

index efa3e8680b46e141fd28292f3a23aed235ed3060..e74d9abf619ce5e08c30b0896bf34d5d6fbfe7b7 100644

--- a/sdk/lib/_internal/compiler/implementation/inferrer/simple_types_inferrer.dart

+++ b/sdk/lib/_internal/compiler/implementation/inferrer/simple_types_inferrer.dart

@@ -36,16 +36,15 @@ class TypeMaskSystem implements TypeSystem<TypeMask> {

if (annotation.treatAsDynamic) return type;

if (annotation.element == compiler.objectClass) return type;

TypeMask otherType;

- if (annotation.kind == TypeKind.TYPEDEF

- || annotation.kind == TypeKind.FUNCTION) {

+ if (annotation.isTypedef || annotation.isFunctionType) {

otherType = functionType;

- } else if (annotation.kind == TypeKind.TYPE_VARIABLE) {

+ } else if (annotation.isTypeVariable) {

// TODO(ngeoffray): Narrow to bound.

return type;

} else if (annotation.isVoid) {

otherType = nullType;

} else {

- assert(annotation.kind == TypeKind.INTERFACE);

+ assert(annotation.isInterfaceType);

otherType = new TypeMask.nonNullSubtype(annotation.element);

}

if (isNullable) otherType = otherType.nullable();