dart2js-kernel: Implement JS_CALL_IN_ISOLATE

pkg/compiler/lib/src/ssa/builder_kernel.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../common/codegen.dart' show CodegenRegistry, CodegenWorkItem;
 import '../common/names.dart';
 import '../common/tasks.dart' show CompilerTask;
@@ skipping 1194 matching lines @@
             "to '$methodName'."
       });
       return null;
     }
 
     HConstant hConstant = instruction;
     StringConstantValue stringConstant = hConstant.constant;
     return stringConstant.primitiveValue.slowToString();
   }
 
-  // TODO(sra): Remove when handleInvokeStaticForeign fully implemented.
-  void unhandledForeign(ir.StaticInvocation invocation) {
-    ir.Procedure target = invocation.target;
-    TypeMask typeMask = astAdapter.returnTypeOf(target);
-    List<HInstruction> arguments = _visitArguments(invocation.arguments);
-    _pushStaticInvocation(target, arguments, typeMask);
-  }
-
   void handleForeignJsCurrentIsolateContext(ir.StaticInvocation invocation) {
     if (_unexpectedForeignArguments(invocation, 0, 0)) {
       stack.add(graph.addConstantNull(compiler)); // Result expected on stack.
       return;
     }
 
     if (!compiler.hasIsolateSupport) {
       // If the isolate library is not used, we just generate code
       // to fetch the static state.
       String name = backend.namer.staticStateHolder;
       push(new HForeignCode(
           js.js.parseForeignJS(name), backend.dynamicType, <HInstruction>[],
           nativeBehavior: native.NativeBehavior.DEPENDS_OTHER));
     } else {
       // Call a helper method from the isolate library. The isolate library uses
       // its own isolate structure that encapsulates the isolate structure used
       // for binding to methods.
       ir.Procedure target = astAdapter.currentIsolate;
       if (target == null) {
         compiler.reporter.internalError(astAdapter.getNode(invocation),
             'Isolate library and compiler mismatch.');
       }
       _pushStaticInvocation(target, <HInstruction>[], backend.dynamicType);
     }
   }
 
   void handleForeignJsCallInIsolate(ir.StaticInvocation invocation) {
-    unhandledForeign(invocation);

[Siggi Cherem (dart-lang), 2016/12/04 05:02:41]

woo hoo!

+    if (_unexpectedForeignArguments(invocation, 2, 2)) {
+      stack.add(graph.addConstantNull(compiler)); // Result expected on stack.
+      return;
+    }
+
+    List<HInstruction> inputs = _visitArguments(invocation.arguments);
+
+    if (!compiler.hasIsolateSupport) {
+      // If the isolate library is not used, we ignore the isolate argument and
+      // just invoke the closure.
+      push(new HInvokeClosure(new Selector.callClosure(0),
+          <HInstruction>[inputs[1]], backend.dynamicType));
+    } else {
+      // Call a helper method from the isolate library.
+      ir.Procedure callInIsolate = astAdapter.callInIsolate;
+      if (callInIsolate == null) {
+        compiler.reporter.internalError(astAdapter.getNode(invocation),
+            'Isolate library and compiler mismatch.');
+      }
+      _pushStaticInvocation(callInIsolate, inputs, backend.dynamicType);
+    }
   }
 
   void handleForeignDartClosureToJs(
       ir.StaticInvocation invocation, String name) {
     // TODO(sra): Do we need to wrap the closure in something that saves the
     // current isolate?
     handleForeignRawFunctionRef(invocation, name);
   }
 
   void handleForeignRawFunctionRef(
@@ skipping 450 matching lines @@
     push(new HNot(popBoolified(), backend.boolType));
   }
 
   @override
   void visitStringConcatenation(ir.StringConcatenation stringConcat) {
     KernelStringBuilder stringBuilder = new KernelStringBuilder(this);
     stringConcat.accept(stringBuilder);
     stack.add(stringBuilder.result);
   }
 }