sdk/lib/_internal/compiler/implementation/native_handler.dart - Issue 12051056: Allow native classes to mixin behavior from an ordinary Dart class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sdk/lib/_internal/compiler/implementation/native_handler.dart

Issue 12051056: Allow native classes to mixin behavior from an ordinary Dart class. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Address review feedback. Created 7 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 | « sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart ('k') | tests/compiler/dart2js_native/native_mixin_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/native_handler.dart

diff --git a/sdk/lib/_internal/compiler/implementation/native_handler.dart b/sdk/lib/_internal/compiler/implementation/native_handler.dart

index 2eaa4af5f13df4d43059ebf794b00f8d0f6d48a7..ccef7f03af6babfdeab78a320107a769147fb1fe 100644

--- a/sdk/lib/_internal/compiler/implementation/native_handler.dart

+++ b/sdk/lib/_internal/compiler/implementation/native_handler.dart

@@ -439,8 +439,17 @@ class NativeCodegenEnqueuer extends NativeEnqueuerBase {

subtypes.add(cls);

}

+ // Skip through all the mixin applications in the super class

+ // chain. That way, the direct subtypes set only contain the

+ // natives classes.

+ ClassElement superclass = cls.superclass;

+ while (superclass != null && superclass.isMixinApplication) {

+ assert(!superclass.isNative());

+ superclass = superclass.superclass;

+ }

List<Element> directSubtypes = emitter.directSubtypes.putIfAbsent(

- cls.superclass,

+ superclass,

() => <ClassElement>[]);

directSubtypes.add(cls);

}