| Index: sdk/lib/_internal/compiler/implementation/enqueue.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/enqueue.dart b/sdk/lib/_internal/compiler/implementation/enqueue.dart
|
| index eac0761044ab1cad606f5fa68012a26382cd8ee9..584679e337766f8a11874b8959b76e92291aaad7 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/enqueue.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/enqueue.dart
|
| @@ -41,6 +41,8 @@ class Enqueuer {
|
| bool queueIsClosed = false;
|
| EnqueueTask task;
|
|
|
| + native.NativeEnqueuer nativeEnqueuer; // Set by compiler.
|
| +
|
| Enqueuer(this.name, this.compiler,
|
| ItemCompilationContext itemCompilationContextCreator())
|
| : this.itemCompilationContextCreator = itemCompilationContextCreator,
|
| @@ -116,6 +118,8 @@ class Enqueuer {
|
| && library.uri.toString() == 'dart:isolate') {
|
| compiler.enableIsolateSupport(library);
|
| }
|
| +
|
| + nativeEnqueuer.registerElement(element);
|
| }
|
|
|
| /**
|
| @@ -167,7 +171,11 @@ class Enqueuer {
|
| if (universe.generatedCode.containsKey(member)) return;
|
| if (resolvedElements[member] != null) return;
|
| if (!member.isInstanceMember()) return;
|
| - if (member.isField()) return;
|
| + if (member.isField()) {
|
| + // Native fields need to go into instanceMembersByName as they are virtual
|
| + // instantiation points and escape points.
|
| + if (!member.enclosingElement.isNative()) return;
|
| + }
|
|
|
| String memberName = member.name.slowToString();
|
| Link<Element> members = instanceMembersByName.putIfAbsent(
|
| @@ -203,6 +211,18 @@ class Enqueuer {
|
| if (universe.hasInvokedSetter(member, compiler)) {
|
| return addToWorkList(member);
|
| }
|
| + } else if (identical(member.kind, ElementKind.FIELD)) {
|
| + if (member.enclosingElement.isNative()) {
|
| + // print('process $member');
|
| + // print(' $memberName: ${instanceMembersByName[memberName]}');
|
| + if (universe.hasInvokedGetter(member, compiler) ||
|
| + universe.hasInvocation(member, compiler)) {
|
| + nativeEnqueuer.registerFieldLoad(member);
|
| + }
|
| + if (universe.hasInvokedSetter(member, compiler)) {
|
| + nativeEnqueuer.registerFieldStore(member);
|
| + }
|
| + }
|
| }
|
| }
|
|
|
| @@ -292,7 +312,18 @@ class Enqueuer {
|
| void handleUnseenSelector(SourceString methodName, Selector selector) {
|
| processInstanceMembers(methodName, (Element member) {
|
| if (selector.applies(member, compiler)) {
|
| - addToWorkList(member);
|
| + // print('unseen $selector add $member ${member.kind}');
|
| + if (member.isField() && member.enclosingElement.isNative()) {
|
| + if (selector.isGetter() || selector.isCall()) {
|
| + nativeEnqueuer.registerFieldLoad(member);
|
| + nativeEnqueuer.registerFieldStore(member);
|
| + } else {
|
| + nativeEnqueuer.registerFieldStore(member);
|
| + nativeEnqueuer.registerFieldLoad(member);
|
| + }
|
| + } else {
|
| + addToWorkList(member);
|
| + }
|
| return true;
|
| }
|
| return false;
|
|
|