fix #29544, mixins to a class with named constructors

[email protected]

Review-Url: https://codereview.chromium.org/2859703003 .

Author: Jennifer Messerly

pkg/dev_compiler/lib/js/amd/dart_sdk.js

@@ -191,12 +191,8 @@ define(['dart_sdk', 'async_helper', 'expect', 'unittest', 'is', 'require'],
       'memory_swap_test': skip_timeout,
       'method_invocation_test': fail,
       'mint_arithmetic_test': fail,
-      'mixin_forwarding_constructor3_test': fail,
       'mixin_implements_test': fail,
       'mixin_regress_13688_test': fail,
-      'mixin_super_constructor_test': fail, // https://github.com/dart-lang/sdk/issues/28059
-      'mixin_super_constructor2_test': fail, // Issue 28059
-      'mixin_super_constructor_named_test_none_multi': fail, // Issue 28059
       'mixin_super_constructor_positionals_test_none_multi': fail, // Issue 28059
       'modulo_test': fail,
       'named_parameter_clash_test': fail,

pkg/dev_compiler/lib/js/amd/dart_sdk.js.map

@@ -33,7 +33,7 @@ mixin(base, @rest mixins) => JS(
   for (let m of $mixins) {
     $copyProperties(Mixin.prototype, m.prototype);
   }
-  // Initializer method: run mixin initializers, then the base.
+  // Initializer methods: run mixin initializers, then the base.
   Mixin.prototype.new = function(...args) {
     // Run mixin initializers. They cannot have arguments.
     // Run them backwards so most-derived mixin is initialized first.
@@ -43,6 +43,20 @@ mixin(base, @rest mixins) => JS(
     // Run base initializer.
     $base.prototype.new.apply(this, args);
   };
+  let namedCtors = ${safeGetOwnProperty(base, _namedConstructors)};
+  if ($base[$_namedConstructors] != null) {
+    for (let namedCtor of $base[$_namedConstructors]) {
+      Mixin.prototype[namedCtor] = function(...args) {
+        // Run mixin initializers. They cannot have arguments.
+        // Run them backwards so most-derived mixin is initialized first.
+        for (let i = $mixins.length - 1; i >= 0; i--) {
+          $mixins[i].prototype.new.call(this);
+        }
+        // Run base initializer.
+        $base.prototype[namedCtor].apply(this, args);
+      };
+    }
+  }
 
   // Set the signature of the Mixin class to be the composition
   // of the signatures of the mixins.
@@ -424,13 +438,18 @@ defineNamedConstructor(clazz, name) => JS(
   let proto = $clazz.prototype;
   let initMethod = proto[$name];
   let ctor = function(...args) { initMethod.apply(this, args); };
-  ctor[$isNamedConstructor] = true;
   ctor.prototype = proto;
   // Use defineProperty so we don't hit a property defined on Function,
   // like `caller` and `arguments`.
   $defineProperty($clazz, $name, { value: ctor, configurable: true });
+
+  let namedCtors = ${safeGetOwnProperty(clazz, _namedConstructors)};
+  if (namedCtors == null) $clazz[$_namedConstructors] = namedCtors = [];
+  namedCtors.push($name);
 })()''');
 
+final _namedConstructors = JS('', 'Symbol("_namedConstructors")');
+
 final _extensionType = JS('', 'Symbol("extensionType")');
 
 getExtensionType(obj) => JS('', '#[#]', obj, _extensionType);

pkg/dev_compiler/lib/js/common/dart_sdk.js

@@ -72,7 +72,6 @@ lazyFn(closure, computeType) {
 
 // TODO(vsm): How should we encode the runtime type?
 final _runtimeType = JS('', 'Symbol("_runtimeType")');
-final isNamedConstructor = JS('', 'Symbol("isNamedConstructor")');
 
 final _moduleName = JS('', 'Symbol("_moduleName")');
 
@@ -188,7 +187,6 @@ lazyAnonymousJSType(name) {
 unwrapType(WrappedType obj) => obj._wrappedType;
 
 _getRuntimeType(value) => JS('', '#[#]', value, _runtimeType);
-getIsNamedConstructor(value) => JS('', '#[#]', value, isNamedConstructor);
 
 /// Return the module name for a raw library object.
 getModuleName(value) => JS('', '#[#]', value, _moduleName);

pkg/dev_compiler/lib/js/common/dart_sdk.js.map

@@ -40,7 +40,7 @@ getOwnNamesAndSymbols(obj) {
   return JS('', '#.concat(#)', names, symbols);
 }
 
-safeGetOwnProperty(obj, String name) {
+safeGetOwnProperty(obj, name) {
   var desc = getOwnPropertyDescriptor(obj, name);
   if (desc != null) return JS('', '#.value', desc);
 }

pkg/dev_compiler/lib/js/es6/dart_sdk.js

@@ -0,0 +1,31 @@
+// Copyright (c) 2017, 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:expect/expect.dart";
+
+var calls = <String>[];
+
+abstract class A {
+  bool _done = true;
+  var a = calls.add('A()') as dynamic;
+}
+
+abstract class B {
+  B.protected() {
+    calls.add('B.protected()');
+  }
+}
+
+class C extends B with A {
+  C() : super.protected() {
+    calls.add('C()');
+  }
+}
+
+void main() {
+  var c = new C();
+  print(calls.join(', '));
+  Expect.isTrue(c._done);
+  Expect.equals(calls.join(', '), 'A(), B.protected(), C()');
+}