Fix a batch of DDC SDK compile errors.

[email protected], [email protected]

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

Author: munificent

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

@@ -10,13 +10,14 @@ import 'dart:_js_helper'
         patch,
         checkInt,
         getRuntimeType,
+        getTraceFromException,
         jsonEncodeNative,
         JsLinkedHashMap,
         JSSyntaxRegExp,
-        Primitives,
-        stringJoinUnchecked,
+        NoInline,
         objectHashCode,
-        getTraceFromException;
+        Primitives,
+        stringJoinUnchecked;
 
 import 'dart:_foreign_helper' show JS;
 
@@ -131,6 +132,7 @@ class int {
 
   @patch
   factory int.fromEnvironment(String name, {int defaultValue}) {
+    // ignore: const_constructor_throws_exception
     throw new UnsupportedError(
         'int.fromEnvironment can only be used as a const constructor');
   }
@@ -391,6 +393,7 @@ class String {
 
   @patch
   factory String.fromEnvironment(String name, {String defaultValue}) {
+    // ignore: const_constructor_throws_exception
     throw new UnsupportedError(
         'String.fromEnvironment can only be used as a const constructor');
   }
@@ -445,6 +448,7 @@ class String {
 class bool {
   @patch
   factory bool.fromEnvironment(String name, {bool defaultValue: false}) {
+    // ignore: const_constructor_throws_exception
     throw new UnsupportedError(
         'bool.fromEnvironment can only be used as a const constructor');
   }

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

@@ -4,6 +4,11 @@
 
 part of dart._js_helper;
 
+/// Tells the optimizing compiler to always inline the annotated method.
+class ForceInline {
+  const ForceInline();
+}
+
 /// Tells the optimizing compiler that the annotated method cannot throw.
 /// Requires @NoInline() to function correctly.
 class NoThrows {

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

@@ -1,4 +1,3 @@
-[error] A value of type 'Future<Null>' can't be assigned to a variable of type '_Future'. (dart:async/future.dart, line 138, col 38)
 [error] Couldn't infer type parameter 'T'.
 
 Tried to infer '_ControllerEventSinkWrapper<dynamic>' for 'T' which doesn't work:
@@ -12,7 +11,6 @@ Consider passing explicit type argument(s) to the generic.
 
  (dart:async/stream.dart, line 1322, col 16)
 [error] The argument type 'ZoneUnaryCallback(EventSink<T>) → dynamic' can't be assigned to the parameter type '(_ControllerEventSinkWrapper<dynamic>) → dynamic'. (dart:async/stream.dart, line 1322, col 32)
-[error] Type parameter bound types must be instantiated. (dart:collection/queue.dart, line 97, col 32)
 [error] Invalid override. The type of '_UnicodeSubsetEncoder.startChunkedConversion' ('(Sink<List<int>>) → StringConversionSink') isn't a subtype of 'ChunkedConverter<String, List<int>, String, List<int>>.startChunkedConversion' ('(dynamic) → dynamic'). (dart:convert/ascii.dart, line 106, col 3)
 [error] Invalid override. The type of '_UnicodeSubsetEncoder.bind' ('(Stream<String>) → Stream<List<int>>') isn't a subtype of 'ChunkedConverter<String, List<int>, String, List<int>>.bind' ('(dynamic) → dynamic'). (dart:convert/ascii.dart, line 114, col 3)
 [error] Invalid override. The type of '_UnicodeSubsetDecoder.startChunkedConversion' ('(Sink<String>) → ByteConversionSink') isn't a subtype of 'ChunkedConverter<List<int>, String, List<int>, String>.startChunkedConversion' ('(dynamic) → dynamic'). (dart:convert/ascii.dart, line 219, col 3)
@@ -40,22 +38,12 @@ Consider passing explicit type argument(s) to the generic.
 [error] Invalid override. The type of 'Utf8Encoder.bind' ('(Stream<String>) → Stream<List<int>>') isn't a subtype of 'ChunkedConverter<String, List<int>, String, List<int>>.bind' ('(dynamic) → dynamic'). (dart:convert/utf.dart, line 129, col 3)
 [error] Invalid override. The type of 'Utf8Decoder.startChunkedConversion' ('(Sink<String>) → ByteConversionSink') isn't a subtype of 'ChunkedConverter<List<int>, String, List<int>, String>.startChunkedConversion' ('(dynamic) → dynamic'). (dart:convert/utf.dart, line 357, col 3)
 [error] Invalid override. The type of 'Utf8Decoder.bind' ('(Stream<List<int>>) → Stream<String>') isn't a subtype of 'ChunkedConverter<List<int>, String, List<int>, String>.bind' ('(dynamic) → dynamic'). (dart:convert/utf.dart, line 368, col 3)
-[error] Only redirecting factory constructors can be declared to be 'const'. (dart:core/bool.dart, line 41, col 9)
-[error] Const constructors can't throw exceptions. (dart:core/bool.dart, line 42, col 5)
-[error] Only redirecting factory constructors can be declared to be 'const'. (dart:core/int.dart, line 33, col 9)
-[error] Const constructors can't throw exceptions. (dart:core/int.dart, line 34, col 5)
-[error] Annotation must be either a const variable reference or const constructor invocation. (dart:core/stacktrace.dart, line 43, col 3)
-[error] Only redirecting factory constructors can be declared to be 'const'. (dart:core/string.dart, line 156, col 9)
-[error] Const constructors can't throw exceptions. (dart:core/string.dart, line 157, col 5)
-[error] Annotation must be either a const variable reference or const constructor invocation. (dart:developer, line 39, col 1)
 [error] The getter 'value' isn't defined for the class 'num'. (dart:html, line 40486, col 21)
 [error] A value of type 'Dimension' can't be assigned to a variable of type 'num'. (dart:html, line 40486, col 44)
 [error] The getter 'value' isn't defined for the class 'num'. (dart:html, line 40506, col 20)
 [error] A value of type 'Dimension' can't be assigned to a variable of type 'num'. (dart:html, line 40506, col 42)
 [error] Base class introduces an invalid override. The type of 'Converter.bind' ('(Stream<List<int>>) → Stream<List<int>>') isn't a subtype of 'ChunkedConverter<List<int>, List<int>, List<int>, List<int>>.bind' ('(dynamic) → dynamic'). (dart:io/data_transformer.dart, line 295, col 19)
 [error] Invalid override. The type of 'ZLibEncoder.startChunkedConversion' ('(Sink<List<int>>) → ByteConversionSink') isn't a subtype of 'ChunkedConverter<List<int>, List<int>, List<int>, List<int>>.startChunkedConversion' ('(dynamic) → dynamic'). (dart:io/data_transformer.dart, line 388, col 3)
-[error] The argument type '(RandomAccessFile) → Future<RandomAccessFile>' can't be assigned to the parameter type '(RandomAccessFile) → FutureOr<File>'. (dart:io/file_impl.dart, line 202, col 30)
-[error] The return type 'Future<Object>' isn't a 'FutureOr<File>', as defined by the method ''. (dart:io/file_impl.dart, line 591, col 14)
 [error] Undefined name 'lineMode'. (dart:io/stdio.dart, line 57, col 10)
 [error] The name 'echoMode=' is already defined. (dart:io/stdio.dart, line 122, col 12)
 [error] The name 'lineMode=' is already defined. (dart:io/stdio.dart, line 143, col 12)

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

@@ -135,7 +135,7 @@ abstract class FutureOr<T> {
  */
 abstract class Future<T> {
   // The `_nullFuture` is a completed Future with the value `null`.
-  static final _Future _nullFuture = new Future.value(null);
+  static final _Future<Null> _nullFuture = new Future.value(null);
 
   /**
    * Creates a future containing the result of calling [computation]

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

@@ -94,7 +94,7 @@ abstract class Queue<E> implements EfficientLengthIterable<E> {
   void clear();
 }
 
-class _DoubleLink<Link extends _DoubleLink> {
+class _DoubleLink<Link extends _DoubleLink<Link>> {
   Link _previousLink;
   Link _nextLink;
 

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

@@ -38,6 +38,12 @@ class bool {
    *
    *     const isLoggingOn = (const String.fromEnvironment("logging") == "on");
    */
+  // The .fromEnvironment() constructors are special in that we do not want
+  // users to call them using "new". We prohibit that by giving them bodies
+  // that throw, even though const constructors are not allowed to have bodies.
+  // Disable those static errors.
+  //ignore: const_constructor_with_body
+  //ignore: const_factory
   external const factory bool.fromEnvironment(String name,
       {bool defaultValue: false});
 

pkg/dev_compiler/lib/js/legacy/dart_sdk.js

@@ -30,6 +30,12 @@ abstract class int extends num {
    *
    *     const int.fromEnvironment("defaultPort", defaultValue: 80)
    */
+  // The .fromEnvironment() constructors are special in that we do not want
+  // users to call them using "new". We prohibit that by giving them bodies
+  // that throw, even though const constructors are not allowed to have bodies.
+  // Disable those static errors.
+  //ignore: const_constructor_with_body
+  //ignore: const_factory
   external const factory int.fromEnvironment(String name, {int defaultValue});
 
   /**

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

@@ -143,6 +143,12 @@ abstract class String implements Comparable<String>, Pattern {
    *
    *     var isDeclared = const String.fromEnvironment("maybeDeclared") != null;
    */
+  // The .fromEnvironment() constructors are special in that we do not want
+  // users to call them using "new". We prohibit that by giving them bodies
+  // that throw, even though const constructors are not allowed to have bodies.
+  // Disable those static errors.
+  //ignore: const_constructor_with_body
+  //ignore: const_factory
   external const factory String.fromEnvironment(String name,
       {String defaultValue});
 

pkg/dev_compiler/lib/sdk/ddc_sdk.sum

@@ -199,7 +199,7 @@ class _FileStreamConsumer extends StreamConsumer<List<int>> {
   }
 
   Future<File> close() =>
-      _openFuture.then<File>((openedFile) => openedFile.close());
+      _openFuture.then((openedFile) => openedFile.close()).then((_) => _file);
 }
 
 // Class for encapsulating the native implementation of files.
@@ -556,7 +556,7 @@ class _File extends FileSystemEntity implements File {
   Future<File> writeAsBytes(List<int> bytes,
       {FileMode mode: FileMode.WRITE, bool flush: false}) {
     return open(mode: mode).then((file) {
-      return file.writeFrom(bytes, 0, bytes.length).then((_) {
+      return file.writeFrom(bytes, 0, bytes.length).then<File>((_) {
         if (flush) return file.flush().then((_) => this);
         return this;
       }).whenComplete(file.close);