fix #30030, fix #27327 - fix tearoffs and various Object member bugs

pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/operations.dart

 // Copyright (c) 2015, 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.
 
 /// This library defines runtime operations on objects used by the code
 /// generator.
 part of dart._runtime;
 
 class InvocationImpl extends Invocation {
   final Symbol memberName;
@@ skipping 18 matching lines @@
   }
 }
 
 /// Given an object and a method name, tear off the method.
 /// Sets the runtime type of the torn off method appropriately,
 /// and also binds the object.
 ///
 /// If the optional `f` argument is passed in, it will be used as the method.
 /// This supports cases like `super.foo` where we need to tear off the method
 /// from the superclass, not from the `obj` directly.
-/// TODO(leafp): Consider caching the tearoff on the object?
+// TODO(leafp): Consider caching the tearoff on the object?
 bind(obj, name, f) {
-  if (f == null) f = JS('', '#[#]', obj, name);
-
-  // TODO(jmesserly): it would be nice to do this lazily, but JS interop seems
-  // to require us to be eager (the test below).
-  var sig = getMethodType(getType(obj), name);
-
-  // JS interop case: do not bind this for compatibility with the dart2js
-  // implementation where we cannot bind this reliably here until we trust
-  // types more.
-  if (sig == null) return f;
-
-  f = JS('', '#.bind(#)', f, obj);
+  // Handle Object members.
+  var method;
+  if (JS('bool', '# === "toString"', name)) {
+    method = _toString;
+    f = JS('', '() => #(#)', _toString, obj);
+  } else if (JS('bool', '# === "noSuchMethod"', name)) {
+    method = noSuchMethod;
+    f = JS('', '(i) => #(#, i)', noSuchMethod, obj);
+  } else {
+    // All other members
+    if (f == null) f = JS('', '#[#]', obj, name);
+    method = f;
+    f = JS('', '#.bind(#)', f, obj);
+  }
+  // TODO(jmesserly): should we canonicalize tearoffs so we don't need to
+  // define ==/hashCode? Then we'd only need the signature.
+  // Another idea here is to have a type that maps to Funtion.prototype,

[vsm, 2017/06/30 18:08:47]

Funtion -> Function

+  // similar to all other JS types. That would give us a place to put function
+  // equality, hashCode, runtimeType, noSuchMethod, and toString, rather than
+  // it being a special case in every Object member helper.
   JS(
       '',
-      r'''#[dartx["=="]] = function boundMethodEquals(other) {
-    return other[#] === this[#] && other[#] === this[#];
-  }''',
+      '#[dartx["=="]] = '
+      '(f) => { let eq = f[#]; return eq != null && eq(#, #); }',
       f,
-      _boundMethodTarget,
-      _boundMethodTarget,
-      _boundMethodName,
-      _boundMethodName);
-  JS('', '#[#] = #', f, _boundMethodTarget, obj);
-  JS('', '#[#] = #', f, _boundMethodName, name);
-  tag(f, sig);
+      _tearoffEquals,
+      obj,
+      method);
+  JS('', '#[#] = (o, m) => o === # && m === #', f, _tearoffEquals, obj, method);
+  JS(
+      '',
+      '#[#] = function() {'
+      'let hash = (17 * 31 + #) & 0x1fffffff;'
+      'return (hash * 31 + #) & 0x1fffffff; }',
+      f,
+      _tearoffHashcode,
+      hashCode(obj),
+      hashCode(method));
+  tagLazy(f, JS('', '() => #', getMethodType(getType(obj), name)));
   return f;
 }
 
-final _boundMethodTarget = JS('', 'Symbol("_boundMethodTarget")');
-final _boundMethodName = JS('', 'Symbol("_boundMethodName")');
+final _tearoffEquals = JS('', 'Symbol("_tearoffEquals")');
+final _tearoffHashcode = JS('', 'Symbol("_tearoffHashcode")');
 
 /// Instantiate a generic method.
 ///
 /// We need to apply the type arguments both to the function, as well as its
 /// associated function type.
 gbind(f, @rest typeArgs) {
   var result = JS('', '#.apply(null, #)', f, typeArgs);
   var sig = JS('', '#.instantiate(#)', _getRuntimeType(f), typeArgs);
   tag(result, sig);
   return result;
 }
 
 // Warning: dload, dput, and dsend assume they are never called on methods
 // implemented by the Object base class as those methods can always be
 // statically resolved.
 dload(obj, field) {
   var f = _canonicalMember(obj, field);
 
   _trackCall(obj);
   if (f != null) {
     var type = getType(obj);
 
     if (hasField(type, f) || hasGetter(type, f)) return JS('', '#[#]', obj, f);
-    if (hasMethod(type, f)) return bind(obj, f, JS('', 'void 0'));
+    if (hasMethod(type, f)) return bind(obj, f, null);
 
     // Always allow for JS interop objects.
     if (isJsInterop(obj)) return JS('', '#[#]', obj, f);
   }
   return noSuchMethod(
       obj, new InvocationImpl(field, JS('', '[]'), isGetter: true));
 }
 
 // Version of dload that matches legacy mirrors behavior for JS types.
 dloadMirror(obj, field) {
@@ skipping 391 matching lines @@
 /// in strong mode
 instanceOfOrNull(obj, type) => JS(
     '',
     '''(() => {
   // If strongInstanceOf returns null, convert to false here.
   if (($obj == null) || $strongInstanceOf($obj, $type, true)) return true;
   return false;
 })()''');
 
 @JSExportName('is')
-instanceOf(obj, type) => JS(
+bool instanceOf(obj, type) => JS(
     '',
     '''(() => {
   if ($obj == null) {
     return $type == $Null || $_isTop($type);
   }
   let result = $strongInstanceOf($obj, $type);
   if (result !== null) return result;
   if (!dart.__failForWeakModeIsChecks) return false;
   let actual = $getReifiedType($obj);
   let message = 'Strong mode is-check failure: ' +
@@ skipping 360 matching lines @@
 hashCode(obj) {
   if (obj == null) return 0;
 
   switch (JS('String', 'typeof #', obj)) {
     case "number":
       return JS('', '# & 0x1FFFFFFF', obj);
     case "boolean":
       // From JSBool.hashCode, see comment there.
       return JS('', '# ? (2 * 3 * 23 * 3761) : (269 * 811)', obj);
     case "function":
-      // TODO(jmesserly): this doesn't work for method tear-offs.
+      var hashFn = JS('', '#[#]', obj, _tearoffHashcode);
+      if (hashFn != null) return JS('int', '#()', hashFn);
       return Primitives.objectHashCode(obj);
   }
 
   var extension = getExtensionType(obj);
   if (extension != null) {
     return JS('', '#[dartx.hashCode]', obj);
   }
   return JS('', '#.hashCode', obj);
 }
 
@@ skipping 97 matching lines @@
     JS('', '# = "+" + #', name, name);
   }
   return name;
 }
 
 /// Emulates the implicit "loadLibrary" function provided by a deferred library.
 ///
 /// Libraries are not actually deferred in DDC, so this just returns a future
 /// that completes immediately.
 Future loadLibrary() => new Future.value();
+
+/// Defines lazy statics.
+void defineLazy(to, from) {
+  for (var name in getOwnNamesAndSymbols(from)) {
+    defineLazyProperty(to, name, getOwnPropertyDescriptor(from, name));
+  }
+}