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

Unified Diff: pkg/compiler/lib/src/kernel/element_map.dart

Issue 2836993003: Handle instantiation of native classes in closed_world2_test (Closed)
Patch Set: Fixes Created 3 years, 8 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/compiler/lib/src/js_backend/backend.dart ('k') | pkg/compiler/lib/src/kernel/kernel_strategy.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/kernel/element_map.dart
diff --git a/pkg/compiler/lib/src/kernel/element_map.dart b/pkg/compiler/lib/src/kernel/element_map.dart
index f1f74616d39a4ca7e0477f35fcdddbc2c649c72c..f40384737e1e2958c8c5ceff3c9c710d4bb96690 100644
--- a/pkg/compiler/lib/src/kernel/element_map.dart
+++ b/pkg/compiler/lib/src/kernel/element_map.dart
@@ -33,7 +33,6 @@ import 'element_adapter.dart';
import 'elements.dart';
part 'native_basic_data.dart';
-part 'native_class_resolver.dart';
part 'no_such_method_resolver.dart';
part 'types.dart';
@@ -443,7 +442,8 @@ class KernelToElementMap extends KernelElementAdapterMixin {
LinkBuilder<InterfaceType> linkBuilder =
new LinkBuilder<InterfaceType>();
if (node.mixedInType != null) {
- linkBuilder.addLast(processSupertype(node.mixedInType));
+ linkBuilder
+ .addLast(env.mixedInType = processSupertype(node.mixedInType));
}
node.implementedTypes.forEach((ir.Supertype supertype) {
linkBuilder.addLast(processSupertype(supertype));
@@ -486,6 +486,17 @@ class KernelToElementMap extends KernelElementAdapterMixin {
env.orderedTypeSet.supertypes.forEach(f);
}
+ void _forEachMixin(KClass cls, void f(ClassEntity mixin)) {
+ while (cls != null) {
+ _KClassEnv env = _classEnvs[cls.classIndex];
+ _ensureSupertypes(cls, env);
+ if (env.mixedInType != null) {
+ f(env.mixedInType.element);
+ }
+ cls = env.supertype?.element;
+ }
+ }
+
void _forEachClassMember(
KClass cls, void f(ClassEntity cls, MemberEntity member)) {
_KClassEnv env = _classEnvs[cls.classIndex];
@@ -699,6 +710,7 @@ class _KClassEnv {
InterfaceType thisType;
InterfaceType rawType;
InterfaceType supertype;
+ InterfaceType mixedInType;
OrderedTypeSet orderedTypeSet;
Map<String, ir.Member> _constructorMap;
@@ -932,7 +944,7 @@ class KernelElementEnvironment implements ElementEnvironment {
@override
void forEachMixin(ClassEntity cls, void f(ClassEntity mixin)) {
- throw new UnimplementedError('KernelElementEnvironment.forEachMixin');
+ elementMap._forEachMixin(cls, f);
}
@override
« no previous file with comments | « pkg/compiler/lib/src/js_backend/backend.dart ('k') | pkg/compiler/lib/src/kernel/kernel_strategy.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698