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

Unified Diff: compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantResolver.java

Issue 8624001: Don't allow invoking a constructor as 'const' if it wasn't declared 'const'. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Self-review Created 9 years, 1 month 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: compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantResolver.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantResolver.java b/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantResolver.java
index ffd895d8660700f14b36719992cf6eb5261d7aab..d8bdd9bb09fa5e8df05e03517a6fa8d29c6185c4 100644
--- a/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantResolver.java
+++ b/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantResolver.java
@@ -11,16 +11,20 @@ import com.google.dart.compiler.ast.DartExpression;
import com.google.dart.compiler.ast.DartField;
import com.google.dart.compiler.ast.DartFunction;
import com.google.dart.compiler.ast.DartIdentifier;
+import com.google.dart.compiler.ast.DartInitializer;
import com.google.dart.compiler.ast.DartMethodDefinition;
import com.google.dart.compiler.ast.DartNewExpression;
import com.google.dart.compiler.ast.DartNode;
import com.google.dart.compiler.ast.DartNodeTraverser;
import com.google.dart.compiler.ast.DartParameter;
import com.google.dart.compiler.ast.DartPropertyAccess;
+import com.google.dart.compiler.ast.DartRedirectConstructorInvocation;
+import com.google.dart.compiler.ast.DartSuperConstructorInvocation;
import com.google.dart.compiler.ast.DartUnit;
import com.google.dart.compiler.ast.DartVariable;
import com.google.dart.compiler.ast.DartVariableStatement;
import com.google.dart.compiler.ast.Modifiers;
+import com.google.dart.compiler.type.InterfaceType;
import java.util.List;
@@ -85,6 +89,34 @@ public class CompileTimeConstantResolver {
}
return null;
}
+
+ @Override
+ public Void visitSuperConstructorInvocation(DartSuperConstructorInvocation x) {
+ x.visitChildren(this);
+
+ String name = x.getName() == null ? "" : x.getName().getTargetName();
+ InterfaceType supertype = ((ClassElement) currentHolder).getSupertype();
+ ConstructorElement element = (supertype == null) ?
+ null : Elements.lookupConstructor(supertype.getElement(), name);
+ if (element != null) {
+ recordElement(x, element);
+ }
+ return null;
+ }
+
+ @Override
+ public Void visitRedirectConstructorInvocation(DartRedirectConstructorInvocation x) {
+ x.visitChildren(this);
+
+ String name = x.getName() == null ? "" : x.getName().getTargetName();
+ InterfaceType supertype = ((ClassElement) currentHolder).getSupertype();
+ ConstructorElement element = (supertype == null) ?
+ null : Elements.lookupConstructor(supertype.getElement(), name);
+ if (element != null) {
+ recordElement(x, element);
+ }
+ return null;
+ }
}
private final LibraryElement libraryElement;
@@ -147,12 +179,25 @@ public class CompileTimeConstantResolver {
@Override
public Element visitMethodDefinition(DartMethodDefinition node) {
+ MethodElement member = node.getSymbol();
+ ResolutionContext previousContext = context;
+ context = context.extend(member.getName());
DartFunction functionNode = node.getFunction();
List<DartParameter> parameters = functionNode.getParams();
for (DartParameter parameter : parameters) {
+ getContext().declare(parameter.getSymbol());
// Then resolve the default values.
resolveConstantExpression(parameter.getDefaultExpr());
}
+ Element element = node.getSymbol();
+ if (ElementKind.of(element) == ElementKind.CONSTRUCTOR &&
+ node.getModifiers().isConstant()) {
+ for (DartInitializer initializer : node.getInitializers()) {
+ DartExpression initializerValue = initializer.getValue();
+ resolveConstantExpression(initializerValue);
+ }
+ }
+ context = previousContext;
return null;
}

Powered by Google App Engine
This is Rietveld 408576698