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

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

Issue 11412245: MalformedType used for all invalid type annotations. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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..c8bac5aa3841ca712bfb5886587757348a3df71c 100644
--- a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
+++ b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
@@ -3059,8 +3059,16 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
}
}
+ /**
+ * Documentation wanted -- johnniwinther
+ *
+ * Invariant: [argument] must not be malformed in checked mode.
+ */
HInstruction analyzeTypeArgument(DartType argument, Node currentNode) {
- if (argument == compiler.types.dynamicType) {
+ assert(invariant(currentNode,
+ !compiler.enableTypeAssertions || !argument.isMalformed,
+ message: '$argument is malformed in checked mode'));
+ if (argument == compiler.types.dynamicType || argument.isMalformed) {
// Represent [dynamic] as [null].
return graph.addConstantNull(constantSystem);
}
@@ -3188,7 +3196,15 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
<HInstruction>[typeInfoSetter, newObject, typeInfo]));
}
+ /**
+ * Documentation wanted -- johnniwinther
+ *
+ * Invariant: [type] must not be malformed in checked mode.
+ */
visitNewSend(Send node, InterfaceType type) {
+ assert(invariant(node,
+ !compiler.enableTypeAssertions || !type.isMalformed,
+ message: '$type is malformed in checked mode'));
bool isListConstructor = false;
computeType(element) {
Element originalElement = elements[node];
@@ -3430,8 +3446,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
visitNewExpression(NewExpression node) {
Element element = elements[node.send];
- if (!Elements.isErroneousElement(element) &&
- !Elements.isMalformedElement(element)) {
+ if (!Elements.isErroneousElement(element)) {
FunctionElement function = element;
element = function.redirectionTarget;
}
@@ -3441,24 +3456,28 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
generateThrowNoSuchMethod(node.send,
getTargetName(error, 'constructor'),
argumentNodes: node.send.arguments);
- } else if (error.messageKind == MessageKind.CANNOT_RESOLVE) {
+ } else {
Message message = error.messageKind.message(error.messageArguments);
generateRuntimeError(node.send, message.toString());
- } else {
- compiler.internalError('unexpected unresolved constructor call',
- node: node);
}
} else if (node.isConst()) {
// TODO(karlklose): add type representation
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 type = elements.getType(node);
+ if (compiler.enableTypeAssertions && type.isMalformed) {
+ ErroneousElement error;
+ type.forEachMalformedType((MalformedType malformedType) {
+ error = malformedType.element;
+ return false; // Visit the for malformed type only.
ngeoffray 2012/11/30 12:00:40 for -> first Why the first only? for a type annot
Johnni Winther 2012/12/04 10:07:17 Changed to use the newly added fetchReasonsFromMal
+ });
+ Message message = error.messageKind.message(error.messageArguments);
+ generateRuntimeError(node, message.toString());
+ } else {
+ visitNewSend(node.send, type);
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698