Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java

Issue 49383003: Issue 14358. Check for assignment in any close. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 2 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
Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java
diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java
index b1bb4729f45a427bc44793022cff23a3be13a330..8af880a1aae6d7a591f5e09fb76d624958cd812b 100644
--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java
+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ResolverVisitor.java
@@ -912,6 +912,11 @@ public class ResolverVisitor extends ScopedVisitor {
protected void promote(Expression expression, Type potentialType) {
VariableElement element = getPromotionStaticElement(expression);
if (element != null) {
+ // may be mutated somewhere in closure
+ if (((VariableElementImpl) element).isPotentiallyMutatedInClosure()) {
+ return;
+ }
+ // prepare current variable type
Type type = expression.getStaticType();
// Declared type should not be "dynamic".
if (type == null || type.isDynamic()) {
@@ -1042,7 +1047,7 @@ public class ResolverVisitor extends ScopedVisitor {
*/
private void clearTypePromotionsIfAccessedInScopeAndProtentiallyMutated(ASTNode target) {
for (Element element : promoteManager.getPromotedElements()) {
- if (((VariableElementImpl) element).isPotentiallyMutated()) {
+ if (((VariableElementImpl) element).isPotentiallyMutatedInScope()) {
if (isVariableAccessedInClosure(element, target)) {
promoteManager.setType(element, null);
}

Powered by Google App Engine
This is Rietveld 408576698