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

Unified Diff: pkg/kernel/lib/transformations/mixin_full_resolution.dart

Issue 2669303002: Support for modular mixin resolution. (Closed)
Patch Set: Fix a bug Created 3 years, 10 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 | « pkg/kernel/lib/target/targets.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/kernel/lib/transformations/mixin_full_resolution.dart
diff --git a/pkg/kernel/lib/transformations/mixin_full_resolution.dart b/pkg/kernel/lib/transformations/mixin_full_resolution.dart
index 92ed3b7685e502e92bcf3d573ddd79747acb2e70..8d8434778725ea30e098885f62af0cd7eeab1c74 100644
--- a/pkg/kernel/lib/transformations/mixin_full_resolution.dart
+++ b/pkg/kernel/lib/transformations/mixin_full_resolution.dart
@@ -78,7 +78,8 @@ class MixinFullResolution {
if (!processedClasses.add(class_)) return;
// Ensure super classes have been transformed before this class.
- if (class_.superclass != null) {
+ if (class_.superclass != null &&
+ class_.superclass.level.index >= ClassLevel.Mixin.index) {
transformClass(processedClasses, transformedClasses, class_.superclass);
}
@@ -86,7 +87,7 @@ class MixinFullResolution {
// constructors in this class.
if (!class_.isMixinApplication) return;
- if (class_.mixedInClass.level != ClassLevel.Body) {
+ if (class_.mixedInClass.level.index < ClassLevel.Mixin.index) {
throw new Exception(
'Class "${class_.name}" mixes in "${class_.mixedInClass.name}" from'
' an external library. Did you forget --link?');
« no previous file with comments | « pkg/kernel/lib/target/targets.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698