sdk/lib/_internal/compiler/implementation/ssa/types.dart - Issue 11412245: MalformedType used for all invalid type annotations.

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/ssa/types.dart

Issue 11412245: MalformedType used for all invalid type annotations. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Rebased Created 8 years 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

« sdk/lib/_internal/compiler/implementation/ssa/codegen.dart ('K') | « sdk/lib/_internal/compiler/implementation/ssa/optimize.dart ('k') | sdk/lib/_internal/compiler/implementation/typechecker.dart » ('j') | sdk/lib/_internal/compiler/implementation/typechecker.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/ssa/types.dart

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

index 52a20e787d1ff747740bf137d3e3d5d6bb6bd75b..12800abba88af94f5edb49a42d3c28882aec241f 100644

--- a/sdk/lib/_internal/compiler/implementation/ssa/types.dart

+++ b/sdk/lib/_internal/compiler/implementation/ssa/types.dart

@@ -743,10 +743,12 @@ class HBoundedType extends HType {

}

// If one type is a subtype of the other, we return the former,

// which is the narrower type.

- } else if (compiler.types.isSubtype(type, other.type)) {

- return this;

- } else if (compiler.types.isSubtype(other.type, type)) {

- return other;

+ } else if (!type.isMalformed && !other.type.isMalformed) {

+ if (compiler.types.isSubtype(type, other.type)) {

+ return this;

+ } else if (compiler.types.isSubtype(other.type, type)) {

+ return other;

+ }

}

if (other.isUnknown()) return this;