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

Unified Diff: sdk/lib/_internal/compiler/implementation/ssa/builder.dart

Issue 11348294: Follow-up to https://chromiumcodereview.appspot.com/11416144/. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fixed dart2dart malformed type handling in visitNewExpression(). Fixed comments. Created 8 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: sdk/lib/_internal/compiler/implementation/ssa/builder.dart
diff --git a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
index b654a69c5b6826035aca9baed36ea62a4a3d6d01..a5158c1c746bdc723659bc71e9b3594b2ea716ac 100644
--- a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
+++ b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
@@ -3430,8 +3430,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
visitNewExpression(NewExpression node) {
Element element = elements[node.send];
- if (!Elements.isErroneousElement(element) &&
- !Elements.isMalformedElement(element)) {
+ if (!Elements.isUnresolved(element)) {
FunctionElement function = element;
element = function.redirectionTarget;
}
@@ -3453,12 +3452,15 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
ConstantHandler handler = compiler.constantHandler;
Constant constant = handler.compileNodeWithDefinitions(node, elements);
stack.add(graph.addConstant(constant));
- } else if (Elements.isMalformedElement(element)) {
- Message message =
- MessageKind.TYPE_VARIABLE_WITHIN_STATIC_MEMBER.message([element]);
- generateRuntimeError(node.send, message.toString());
} else {
- visitNewSend(node.send, elements.getType(node));
+ DartType dartType = elements.getType(node);
+ if (dartType.kind == TypeKind.MALFORMED_TYPE &&
+ compiler.enableTypeAssertions) {
+ Message message = MessageKind.MALFORMED_TYPE_REFERENCE.message([node]);
+ generateRuntimeError(node.send, message.toString());
+ } else {
+ visitNewSend(node.send, dartType);
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698