compiler/java/com/google/dart/compiler/type/Types.java - Issue 10827339: Issue 4460. Mark inferred type variable in for-in loop as inferred

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: compiler/java/com/google/dart/compiler/type/Types.java

Issue 10827339: Issue 4460. Mark inferred type variable in for-in loop as inferred (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 8 years, 4 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 | « compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java ('k') | compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: compiler/java/com/google/dart/compiler/type/Types.java

diff --git a/compiler/java/com/google/dart/compiler/type/Types.java b/compiler/java/com/google/dart/compiler/type/Types.java

index 6de2bcbcc0525582149acaa1e8892ccd77a44820..404712705bb0c122126c55007452648534a6164b 100644

--- a/compiler/java/com/google/dart/compiler/type/Types.java

+++ b/compiler/java/com/google/dart/compiler/type/Types.java

@@ -506,12 +506,16 @@ public class Types {

* {@link Type#isInferred()}.

public static Type makeInferred(Type type) {

- if (type != null) {

- Set<Class<?>> interfaceSet = getAllImplementedInterfaces(type.getClass());

- if (!interfaceSet.isEmpty()) {

- Class<?>[] interfaces = (Class[]) interfaceSet.toArray(new Class[interfaceSet.size()]);

- type = makeInferred(type, interfaces);

- }

+ if (type == null) {

+ return null;

+ }

+ if (type.isInferred()) {

+ return type;

+ }

+ Set<Class<?>> interfaceSet = getAllImplementedInterfaces(type.getClass());

+ if (!interfaceSet.isEmpty()) {

+ Class<?>[] interfaces = (Class[]) interfaceSet.toArray(new Class[interfaceSet.size()]);

+ return makeInferred(type, interfaces);

}

return type;

}