Version 2.1.0-dev.0.0

Merge commit 'f3a2c0e28faf132a550c1fad8c2e6d9f67107ab1' into dev

Author: athomas

CHANGELOG.md

@@ -51,19 +51,19 @@ vars = {
   "gperftools_revision": "9608fa3bcf8020d35f59fbf70cd3cbe4b015b972",
 
   # Revisions of /third_party/* dependencies.
-  "args_tag": "1.4.1",
-  "async_tag": "2.0.7",
+  "args_tag": "1.4.4",
+  "async_tag": "2.0.8",
   "bazel_worker_tag": "0.1.11",
-  "boolean_selector_tag" : "1.0.3",
+  "boolean_selector_tag" : "1.0.4",
   "boringssl_gen_rev": "fc47eaa1a245d858bae462cd64d4155605b850ea",
   "boringssl_rev" : "189270cd190267f5bd60cfe8f8ce7a61d07ba6f4",
-  "charcode_tag": "v1.1.1",
+  "charcode_tag": "v1.1.2",
   "chrome_rev" : "19997",
-  "cli_util_rev" : "fb5ee65ab72f6b4dd99a53efd992979ebdaf10df",
-  "collection_tag": "1.14.10",
-  "convert_tag": "2.0.1",
-  "crypto_tag" : "2.0.5",
-  "csslib_tag" : "0.14.1",
+  "cli_util_rev" : "4ad7ccbe3195fd2583b30f86a86697ef61e80f41",
+  "collection_tag": "1.14.11",
+  "convert_tag": "2.0.2",
+  "crypto_tag" : "2.0.6",
+  "csslib_tag" : "0.14.4+1",
   "dart2js_info_tag" : "0.5.6+4",
 
   # Note: updates to dart_style have to be coordinated carefully with
@@ -80,11 +80,11 @@ vars = {
   # For more details, see https://github.com/dart-lang/sdk/issues/30164
   "dart_style_tag": "1.1.3",  # Please see the note above before updating.
 
-  "dartdoc_tag" : "v0.20.1",
-  "fixnum_tag": "0.10.5",
+  "dartdoc_tag" : "v0.20.2",
+  "fixnum_tag": "0.10.8",
   "func_rev": "25eec48146a58967d75330075ab376b3838b18a8",
-  "glob_tag": "1.1.5",
-  "html_tag" : "0.13.3",
+  "glob_tag": "1.1.7",
+  "html_tag" : "0.13.3+2",
   "http_io_rev": "265e90afbffacb7b2988385d4a6aa2f14e970d44",
   "http_multi_server_tag" : "2.0.5",
   "http_parser_tag" : "3.1.1",
@@ -94,55 +94,54 @@ vars = {
   "idl_parser_rev": "5fb1ebf49d235b5a70c9f49047e83b0654031eb7",
   "intl_tag": "0.15.6",
   "jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1",
-  "json_rpc_2_tag": "2.0.8",
+  "json_rpc_2_tag": "2.0.9",
   "linter_tag": "0.1.58",
-  "logging_tag": "0.11.3+1",
-  "markdown_tag": "2.0.1",
+  "logging_tag": "0.11.3+2",
+  "markdown_tag": "2.0.2",
   "matcher_tag": "0.12.3",
-  "mime_tag": "0.9.6+1",
+  "mime_tag": "0.9.6+2",
   "mockito_tag": "d39ac507483b9891165e422ec98d9fb480037c8b",
   "mustache4dart_tag" : "v2.1.2",
   "oauth2_tag": "1.2.1",
   "observatory_pub_packages_rev": "0894122173b0f98eb08863a7712e78407d4477bc",
-  "package_config_tag": "1.0.3",
-  "package_resolver_tag": "1.0.3",
-  "path_tag": "1.5.1",
-  "plugin_tag": "0.2.0+2",
+  "package_config_tag": "1.0.5",
+  "package_resolver_tag": "1.0.4",
+  "path_tag": "1.6.2",
+  "plugin_tag": "f5b4b0e32d1406d62daccea030ba6457d14b1c47",
   "ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
-  "pool_tag": "1.3.4",
+  "pool_tag": "1.3.6",
   "protobuf_tag": "0.9.0",
-  "pub_rev": "58fe996eab8d54f28f5109c407ff0ab62fbd835d",
-  "pub_semver_tag": "1.4.1",
-  "quiver_tag": "0.29.0",
-  "resource_rev": "b786afa7567fc6b95c185edb01cc4e9d3dadbe30",
+  "pub_rev": "5962908a66e814dd78f6856a4e5f792c6db65fbc",
+  "pub_semver_tag": "1.4.2",
+  "quiver_tag": "0.29.0+2",
+  "resource_rev": "2.1.5",
   "root_certificates_rev": "16ef64be64c7dfdff2b9f4b910726e635ccc519e",
   "shelf_static_rev": "v0.2.8",
-  "shelf_packages_handler_tag": "1.0.3",
-  "shelf_tag": "0.7.3+2",
-  "shelf_web_socket_tag": "0.2.2+2",
-  "source_map_stack_trace_tag": "1.1.4",
+  "shelf_packages_handler_tag": "1.0.4",
+  "shelf_tag": "0.7.3+3",
+  "shelf_web_socket_tag": "0.2.2+3",
+  "source_map_stack_trace_tag": "1.1.5",
   "source_maps-0.9.4_rev": "38524",
-  "source_maps_tag": "0.10.6",
-  "source_span_tag": "1.4.0",
-  "stack_trace_tag": "1.9.2",
-  "stream_channel_tag": "1.6.4",
-  "string_scanner_tag": "1.0.2",
-  "sunflower_rev": "879b704933413414679396b129f5dfa96f7a0b1e",
+  "source_maps_tag": "8af7cc1a1c3a193c1fba5993ce22a546a319c40e",
+  "source_span_tag": "1.4.1",
+  "stack_trace_tag": "1.9.3",
+  "stream_channel_tag": "1.6.8",
+  "string_scanner_tag": "1.0.3",
   "test_descriptor_tag": "1.1.1",
   "test_process_tag": "1.0.3",
-  "term_glyph_tag": "1.0.0",
-  "test_reflective_loader_tag": "0.1.4",
+  "term_glyph_tag": "1.0.1",
+  "test_reflective_loader_tag": "0.1.8",
   "test_tag": "1.0.0",
   "tuple_tag": "v1.0.1",
-  "typed_data_tag": "1.1.3",
+  "typed_data_tag": "1.1.6",
   "unittest_rev": "2b8375bc98bb9dc81c539c91aaea6adce12e1072",
   "usage_tag": "3.4.0",
-  "utf_tag": "0.9.0+4",
-  "watcher_rev": "908d74c6ed0889fa9bd7939c72bcc287e4f581fd",
+  "utf_tag": "0.9.0+5",
+  "watcher_rev": "0.9.7+10",
   "web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02",
-  "web_socket_channel_tag": "1.0.8",
+  "web_socket_channel_tag": "1.0.9",
   "WebCore_rev": "fb11e887f77919450e497344da570d780e078bc8",
-  "yaml_tag": "2.1.14",
+  "yaml_tag": "2.1.15",
   "zlib_rev": "c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f",
 }
 
@@ -158,7 +157,7 @@ deps = {
       "packages": [
           {
               "package": "dart/dart-sdk/${{platform}}",
-              "version": "version:2.0.0-dev.68.0",
+              "version": "version:2.0.0-dev.69.5",
           },
       ],
       "dep_type": "cipd",
@@ -328,10 +327,6 @@ deps = {
   Var("dart_root") + "/third_party/pkg/string_scanner":
       Var("dart_git") + "string_scanner.git" +
       "@" + Var("string_scanner_tag"),
-  Var("dart_root") + "/third_party/sunflower":
-      Var("chromium_git") +
-      "/external/github.com/dart-lang/sample-sunflower.git" +
-      "@" + Var("sunflower_rev"),
   Var("dart_root") + "/third_party/pkg/term_glyph":
       Var("dart_git") + "term_glyph.git" + "@" + Var("term_glyph_tag"),
   Var("dart_root") + "/third_party/pkg/test":

DEPS

@@ -27,6 +27,12 @@
     'kernel': {
       'filepath': '^pkg/kernel',
     },
+    'dart2js': {
+      'filepath': (
+        '^pkg/compiler|'
+        '^tests/compiler'
+      )
+    },
     'package_vm': {
       'filepath': '^pkg/vm',
     },
@@ -72,5 +78,7 @@
     'observatory': [ '[email protected]' ],
     'package_vm': [ '[email protected]' ],
     'runtime': [ '[email protected]' ],
+    'dart2js': [ '[email protected]', '[email protected]',
+                 '[email protected]'],
   },
 }

WATCHLISTS

@@ -2,7 +2,7 @@
 
 **Author**: eernst@
 
-**Version**: 0.9 (2018-02-22)
+**Version**: 0.10 (2018-07-10)
 
 **Status**: Under implementation.
 
@@ -274,13 +274,17 @@ for the following situations:
     type void; the static type of the conditional expression is then the
     type void. (*This is true even if one of the branches has a different
     type.*)
+*   In a null coalescing expression `e1 ?? e2`, `e2` may have the type void; the
+    static type of the null coalescing expression is then the type void.
 *   If _N1_ and _N2_ are non-terminals in the Dart grammar, and there is a
     derivation of the form _N1 --> N2_, and _N2_ can have type void, then
     _N1_ can also have type void for such a derivation. *In this derivation
     no additional tokens are included, it is only the non-terminal which
     changes.*
 *   In a return statement `return e;`, when the return type of the innermost
-    enclosing function is the type void, `e` may have type void.
+    enclosing function is the type void or dynamic, `e` may have type void.
+*   In an arrow function body `=> e`, when the return type is the type void
+    or dynamic, the returned expression `e` may have type void.
 *   An initializing expression for a variable of type void may have the type
     void.
 *   An actual parameter expression corresponding to a formal parameter whose
@@ -387,6 +391,10 @@ bound as `Object`.
 
 ## Updates
 
+*   July 10th 2018, v0.10: Added case to whitelist: It is not an error
+    to `return e;` with an `e` of type `void` when the return type is
+    `dynamic`.
+
 *   February 22nd 2018, v0.9: Added several new contexts where an
     expression with static type void may be evaluated, such that pure data
     transfers to a target of type void are allowed. For instance, a void

docs/language/informal/generalized-void.md

@@ -0,0 +1,124 @@
+# Dart 2 function return checking
+
+[email protected]
+
+**Note: Also see alternative presentation at the bottom for a dual presentation
+of these rules in terms of which things are errors, rather than which things are
+valid*.*
+
+## Errors for sync and async function return values in Dart 2
+
+### Expression bodied functions
+
+
+An asynchronous expression bodied function with return type `T` and return
+expression `e` has a valid return if:
+  * `flatten(T)` is `void`
+  * or `return exp;` is a valid return for an equivalent block bodied function
+  with return type `T` as defined below.
+
+A synchronous expression bodied function with return type `T` and return expression
+`e` has a valid return if:
+  * `T` is `void`
+  * or `return exp;` is a valid return for an equivalent block bodied function
+  with return type `T` as defined below.
+
+### Block bodied functions
+
+#### Synchronous functions
+
+The rules for a synchronous non-generator function with declared return type `T`
+are:
+
+* `return;` is a valid return if any of the following are true:
+  * `T` is `void`
+  * `T` is `dynamic`
+  * `T` is `Null`.
+
+* `return exp;` where `exp` has static type `S` is a valid return if:
+  * `S` is `void`
+  * and `T` is `void` or `dynamic` or `Null`
+
+* `return exp;` where `exp` has static type `S` is a valid return if:
+  * `T` is `void`
+  * and `S` is `void` or `dynamic` or `Null`
+
+* `return exp;` where `exp` has static type `S` is a valid return if:
+  * `T` is not `void`
+  * and `S` is not `void`
+  * and `S` is assignable to `T`
+
+#### Asynchronous functions
+
+The rules for an asynchronous non-generator function with declared return type
+`T` are:
+
+* `return;` is a valid return if any of the following are true:
+  * `flatten(T)` is `void`
+  * `flatten(T)` is `dynamic`
+  * `flatten(T)` is `Null`.
+
+* `return exp;` where `exp` has static type `S` is a valid return if:
+  * `flatten(S)` is `void`
+  * and `flatten(T)` is `void`, `dynamic` or `Null`
+
+* `return exp;` where `exp` has static type `S` is a valid return if:
+  * `flatten(T)` is `void`
+  * and `flatten(S)` is `void`, `dynamic` or `Null`
+
+* `return exp;` where `exp` has static type `S` is a valid return if:
+  * `flatten(T)` is not `void`
+  * and `flatten(S)` is not `void`
+  * and `Future<flatten(S)>` is assignable to `T`
+
+
+## Errors for sync and async function return values in Dart 2: Alternative presentation in terms of which things *are* errors
+
+### Expression bodied functions
+
+
+It is an error if an asynchronous expression bodied function with return type `T`
+has return expression `exp` and both:
+  * `flatten(T)` is not `void`
+  * `return exp;` would be an error in an equivalent block bodied function
+  with return type `T` as defined below.
+
+It is an error if a synchronous expression bodied function with return type `T`
+has return expression `exp` and both:
+  * `T` is not `void`
+  * `return exp;` would be an error in an equivalent block bodied function
+  with return type `T` as defined below.
+
+### Block bodied functions
+
+#### Synchronous functions
+
+The rules for a synchronous non-generator function with declared return type `T`
+are:
+
+* `return;` is an error if `T` is not `void`, `dynamic`, or `Null`
+
+* `return exp;` where `exp` has static type `S` is an error if `T` is `void` and
+  `S` is not `void`, `dynamic`, or `Null`
+
+* `return exp;` where `exp` has static type `S` is an error if `S` is `void` and
+  `T` is not `void`, or `dynamic` or `Null`.
+
+* `return exp;` where `exp` has static type `S` is an error if `S` is not
+  assignable to `T`.
+
+#### Asynchronous functions
+
+The rules for an asynchronous non-generator function with declared return type
+`T` are:
+
+* `return;` is an error if `flatten(T)` is not `void`, `dynamic`, or `Null`
+
+* `return exp;` where `exp` has static type `S` is an error if `flatten(T)` is
+  `void` and `flatten(S)` is not `void`, `dynamic`, or `Null`
+
+* `return exp;` where `exp` has static type `S` is an error if `flatten(S)` is
+  `void` and `flatten(T)` is not `void`, `dynamic`, or `Null`.
+
+* `return exp;` where `exp` has static type `S` is an error if
+  `Future<flatten(S)>` is not assignable to `T`.