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

Unified Diff: sdk/lib/_internal/compiler/implementation/js_backend/backend.dart

Issue 22831022: Revert "Fix casts and type assertions on mixins used in native classes" (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 4 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 | sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
index 845ee5ce55ebd86fa2ff65e6ef65c7ebdccb2c57..7a809b704837a6196034428490b1419483c962a2 100644
--- a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
@@ -615,16 +615,14 @@ class JavaScriptBackend extends Backend {
Set<Element> set = interceptedElements.putIfAbsent(
member.name, () => new Set<Element>());
set.add(member);
- },
- includeSuperAndInjectedMembers: true);
-
- // Walk superclass chain to find mixins.
- for (; cls != null; cls = cls.superclass) {
- if (cls.isMixinApplication) {
- MixinApplicationElement mixinApplication = cls;
+ if (classElement == jsInterceptorClass) return;
+ if (classElement.isMixinApplication) {
+ MixinApplicationElement mixinApplication = classElement;
+ assert(member.getEnclosingClass() == mixinApplication.mixin);
classesMixedIntoNativeClasses.add(mixinApplication.mixin);
}
- }
+ },
+ includeSuperAndInjectedMembers: true);
}
}
@@ -757,7 +755,6 @@ class JavaScriptBackend extends Backend {
jsIndexingBehaviorInterface =
compiler.findHelper(const SourceString('JavaScriptIndexingBehavior'));
if (jsIndexingBehaviorInterface != null) {
- jsIndexingBehaviorInterface.ensureResolved(compiler);
world.registerIsCheck(jsIndexingBehaviorInterface.computeType(compiler),
elements);
enqueue(
« no previous file with comments | « no previous file | sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698