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

Unified Diff: dart/pkg/compiler/lib/src/resolution/members.dart

Issue 840723003: Recover from crash in xcodebuild/ReleaseIA32/generated_tests/language/async_test_constructor4.dart. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Merged with r42903. Created 5 years, 11 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 | « dart/pkg/compiler/lib/src/elements/modelx.dart ('k') | dart/tests/language/language_dart2js.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/pkg/compiler/lib/src/resolution/members.dart
diff --git a/dart/pkg/compiler/lib/src/resolution/members.dart b/dart/pkg/compiler/lib/src/resolution/members.dart
index 0965152ac2de26bdeefa117c0a4be4d8713eef19..db2136444d096610584af5ace3e6b3fa671a2384 100644
--- a/dart/pkg/compiler/lib/src/resolution/members.dart
+++ b/dart/pkg/compiler/lib/src/resolution/members.dart
@@ -620,7 +620,7 @@ class ResolverTask extends CompilerTask {
}
return registry.mapping;
} else {
- assert(element.isDeferredLoaderGetter);
+ assert(element.isDeferredLoaderGetter || element.isErroneous);
return _ensureTreeElements(element);
}
} else {
@@ -771,9 +771,10 @@ class ResolverTask extends CompilerTask {
message: 'No TreeElements cached for $factory.'));
FunctionExpression functionNode = factory.parseNode(compiler);
RedirectingFactoryBody redirectionNode = functionNode.body;
- InterfaceType factoryType = treeElements.getType(redirectionNode);
-
- targetType = targetType.substByContext(factoryType);
+ DartType factoryType = treeElements.getType(redirectionNode);
+ if (!factoryType.isDynamic) {
+ targetType = targetType.substByContext(factoryType);
+ }
factory.effectiveTarget = target;
factory.effectiveTargetType = targetType;
}
@@ -4871,7 +4872,12 @@ class ConstructorResolver extends CommonResolverVisitor<Element> {
element, diagnosticNode, element.name, MessageKind.NOT_A_TYPE,
{'node': diagnosticNode});
}
+ } else if (element.isErroneous && element is! ErroneousElementX) {
+ element = new ErroneousConstructorElementX(
+ MessageKind.NOT_A_TYPE, {'node': diagnosticNode},
+ element.name, element);
}
+
if (type == null) {
if (Elements.isUnresolved(element)) {
type = const DynamicType();
@@ -4973,6 +4979,7 @@ Element lookupInScope(Compiler compiler, Node node,
}
TreeElements _ensureTreeElements(AnalyzableElementX element) {
+ if (element.isErroneous) return new TreeElementMapping(element);
if (element._treeElements == null) {
element._treeElements = new TreeElementMapping(element);
}
« no previous file with comments | « dart/pkg/compiler/lib/src/elements/modelx.dart ('k') | dart/tests/language/language_dart2js.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698