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

Unified Diff: sdk/lib/_internal/compiler/implementation/resolution/members.dart

Issue 19469003: Do not use the NamedMixinApplication node for anonymous mixins: otherwise, the [MixinApplicationEle… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 5 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 | « no previous file | tests/language/language.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/resolution/members.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/resolution/members.dart (revision 25201)
+++ sdk/lib/_internal/compiler/implementation/resolution/members.dart (working copy)
@@ -3252,7 +3252,7 @@
DartType supertype = resolveSupertype(element, superMixin.superclass);
Link<Node> link = superMixin.mixins.nodes;
while (!link.isEmpty) {
- supertype = applyMixin(supertype, resolveType(link.head));
+ supertype = applyMixin(supertype, resolveType(link.head), node);
link = link.tail;
}
element.supertype = supertype;
@@ -3314,21 +3314,21 @@
DartType supertype = resolveSupertype(element, node.superclass);
Link<Node> link = node.mixins.nodes;
while (!link.tail.isEmpty) {
- supertype = applyMixin(supertype, resolveType(link.head));
+ supertype = applyMixin(supertype, resolveType(link.head), link.head);
link = link.tail;
}
doApplyMixinTo(element, supertype, resolveType(link.head));
return element.computeType(compiler);
}
- DartType applyMixin(DartType supertype, DartType mixinType) {
+ DartType applyMixin(DartType supertype, DartType mixinType, Node node) {
String superName = supertype.name.slowToString();
String mixinName = mixinType.name.slowToString();
ClassElement mixinApplication = new MixinApplicationElementX(
new SourceString("${superName}_${mixinName}"),
element.getCompilationUnit(),
compiler.getNextFreeClassId(),
- element.parseNode(compiler),
+ node,
Modifiers.EMPTY); // TODO(kasperl): Should this be abstract?
doApplyMixinTo(mixinApplication, supertype, mixinType);
mixinApplication.resolutionState = STATE_DONE;
« no previous file with comments | « no previous file | tests/language/language.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698