Make is checks work on JavaScriptFunction objects.

BUG= R=sra@google.com Review URL: https://codereview.chromium.org/2110273003 .
dart-lang · Jul 1, 2016 · 595ec1d · 595ec1d
1 parent eb20b68
commit 595ec1d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/pkg/compiler/lib/src/js_backend/js_interop_analysis.dart b/pkg/compiler/lib/src/js_backend/js_interop_analysis.dart
@@ -8,6 +8,11 @@ library compiler.src.js_backend.js_interop_analysis;
 import '../common.dart';
 import '../constants/values.dart'
     show ConstantValue, ConstructedConstantValue, StringConstantValue;
+import '../dart_types.dart'
+    show
+        DartType,
+        DynamicType,
+        FunctionType;
 import '../diagnostics/messages.dart' show MessageKind;
 import '../elements/elements.dart'
     show
@@ -185,4 +190,14 @@ class JsInteropAnalysis {
     });
     return new jsAst.Block(statements);
   }
+
+  FunctionType buildJsFunctionType() {
+    // TODO(jacobr): consider using codegenWorld.isChecks to determine the
+    // range of positional arguments that need to be supported by JavaScript
+    // function types.
+    return new FunctionType.synthesized(
+      const DynamicType(),
+      [],
+      new List<DartType>.filled(16, const DynamicType()));
+  }
 }
diff --git a/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart b/pkg/compiler/lib/src/js_emitter/runtime_type_generator.dart
@@ -132,6 +132,17 @@ class RuntimeTypeGenerator {
     _generateIsTestsOn(classElement, generateIsTest,
         generateFunctionTypeSignature, generateSubstitution, generateTypeCheck);
 
+    if (classElement == backend.helpers.jsJavaScriptFunctionClass) {
+        var type = backend.jsInteropAnalysis.buildJsFunctionType();
+        if (type != null) {
+          jsAst.Expression thisAccess = new jsAst.This();
+          RuntimeTypesEncoder rtiEncoder = backend.rtiEncoder;
+          jsAst.Expression encoding =
+              rtiEncoder.getSignatureEncoding(type, thisAccess);
+          jsAst.Name operatorSignature = namer.asName(namer.operatorSignature);
+          result.properties[operatorSignature] = encoding;
+        }
+    }
     return result;
   }
 

diff --git a/tests/html/js_test.dart b/tests/html/js_test.dart
@@ -194,6 +194,8 @@ someObject.role = "object";
   document.body.append(script);
 }
 
+typedef bool StringToBool(String s);
+
 // Some test are either causing other test to fail in IE9, or they are failing
 // for unknown reasons
 // useHtmlConfiguration+ImageData bug: dartbug.com/14355
@@ -922,6 +924,17 @@ main() {
 
     });
 
+    group('JavaScriptFunction', () {
+      test('is check', () {
+        var fn = (String s) => true;
+        var jsFn = allowInterop(fn);
+        expect(fn is StringToBool, isTrue);
+        expect(jsFn is StringToBool, isTrue);
+        expect(jsFn is Function, isTrue);
+        expect(jsFn is List, isFalse);
+      });
+    });
+
     group('Dart->JS', () {
 
       test('Date', () {