| Index: pkg/dev_compiler/lib/js/amd/dart_sdk.js
|
| diff --git a/pkg/dev_compiler/lib/js/amd/dart_sdk.js b/pkg/dev_compiler/lib/js/amd/dart_sdk.js
|
| index 7d20a629ea626a78299e4afaf2d8b7c7812e1cfe..d54076b0795fd6dc9c1f926841e526878ffcf3ea 100644
|
| --- a/pkg/dev_compiler/lib/js/amd/dart_sdk.js
|
| +++ b/pkg/dev_compiler/lib/js/amd/dart_sdk.js
|
| @@ -560,6 +560,7 @@ define([], function() {
|
| let FunctionTovoid = () => (FunctionTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [core.Function])))();
|
| let StringAndStringToString$ = () => (StringAndStringToString$ = dart.constFn(dart.definiteFunctionType(core.String, [core.String, core.String])))();
|
| let TypeAndStringTodynamic = () => (TypeAndStringTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [core.Type, core.String])))();
|
| + let dynamicAnddynamicToint = () => (dynamicAnddynamicToint = dart.constFn(dart.definiteFunctionType(core.int, [dart.dynamic, dart.dynamic])))();
|
| let ListOfEToListOfE = () => (ListOfEToListOfE = dart.constFn(dart.definiteFunctionType(E => [core.List$(E), [core.List$(E)]])))();
|
| let StringTovoid$ = () => (StringTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [core.String])))();
|
| let _IsolateContextAndFunctionTodynamic = () => (_IsolateContextAndFunctionTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [_isolate_helper._IsolateContext, core.Function])))();
|
| @@ -670,7 +671,6 @@ define([], function() {
|
| let ObjectToint = () => (ObjectToint = dart.constFn(dart.definiteFunctionType(core.int, [core.Object])))();
|
| let ObjectTovoid = () => (ObjectTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [core.Object])))();
|
| let StringAndStringTovoid$ = () => (StringAndStringTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [core.String, core.String])))();
|
| - let dynamicAnddynamicToint = () => (dynamicAnddynamicToint = dart.constFn(dart.definiteFunctionType(core.int, [dart.dynamic, dart.dynamic])))();
|
| let MapOfString$StringAndStringToMapOfString$String = () => (MapOfString$StringAndStringToMapOfString$String = dart.constFn(dart.definiteFunctionType(MapOfString$String(), [MapOfString$String(), core.String])))();
|
| let intAndintAndintTovoid = () => (intAndintAndintTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [core.int, core.int, core.int])))();
|
| let String__Tovoid = () => (String__Tovoid = dart.constFn(dart.definiteFunctionType(dart.void, [core.String], [dart.dynamic])))();
|
| @@ -3599,12 +3599,12 @@ define([], function() {
|
| let VoidToE = () => (VoidToE = dart.constFn(dart.functionType(E, [])))();
|
| let ListOfE = () => (ListOfE = dart.constFn(core.List$(E)))();
|
| let ReversedListIterableOfE = () => (ReversedListIterableOfE = dart.constFn(_internal.ReversedListIterable$(E)))();
|
| - let EAndEToint = () => (EAndEToint = dart.constFn(dart.functionType(core.int, [E, E])))();
|
| let SetOfE = () => (SetOfE = dart.constFn(core.Set$(E)))();
|
| let ArrayIteratorOfE = () => (ArrayIteratorOfE = dart.constFn(_interceptors.ArrayIterator$(E)))();
|
| let ListMapViewOfE = () => (ListMapViewOfE = dart.constFn(_internal.ListMapView$(E)))();
|
| let ETobool = () => (ETobool = dart.constFn(dart.functionType(core.bool, [E])))();
|
| let ETovoid = () => (ETovoid = dart.constFn(dart.functionType(dart.void, [E])))();
|
| + let EAndEToint = () => (EAndEToint = dart.constFn(dart.functionType(core.int, [E, E])))();
|
| dart.defineExtensionNames([
|
| 'checkMutable',
|
| 'checkGrowable',
|
| @@ -4044,7 +4044,11 @@ define([], function() {
|
| [dartx.sort](compare) {
|
| if (compare === void 0) compare = null;
|
| this[dartx.checkMutable]('sort');
|
| - _internal.Sort.sort(E)(this, EAndEToint()._check(compare == null ? core.Comparable.compare : compare));
|
| + if (compare == null) {
|
| + _internal.Sort.sort(E)(this, dart.fn((a, b) => core.Comparable.as(a)[dartx.compareTo](b), dynamicAnddynamicToint()));
|
| + } else {
|
| + _internal.Sort.sort(E)(this, compare);
|
| + }
|
| }
|
| [dartx.shuffle](random) {
|
| if (random === void 0) random = null;
|
| @@ -5750,7 +5754,7 @@ define([], function() {
|
| sort(compare) {
|
| if (compare === void 0) compare = null;
|
| if (compare == null) {
|
| - _internal.Sort.sort(core.Comparable)(this, core.Comparable.compare);
|
| + _internal.Sort.sort(E)(this, dart.fn((a, b) => core.Comparable.as(a)[dartx.compareTo](b), dynamicAnddynamicToint()));
|
| } else {
|
| _internal.Sort.sort(E)(this, compare);
|
| }
|
|
|