Version 2.12.0-13.0.dev

Merge commit 'e8c4cc60d6376c94d48ace4cf5bb00caccbc11c7' into 'dev'

Author: Dart CI

pkg/analyzer/CHANGELOG.md

@@ -11,6 +11,14 @@
   is now `FunctionTypeAliasElement`, not its function element.
 * Removed deprecated `GenericTypeAliasElement`.
 
+## 0.40.6
+* The non_nullable feature is released in 2.12 language version.
+* Updated the current language version to 2.12.
+* Changed the default language version when the package does not specify one.
+  Instead of the latest known language version, the language version of the
+  SDK (against which analysis is done, not necessary the same as used to run
+  the analyzer) is used.
+
 ## 0.40.5
 * Deprecated `GenericTypeAliasElement`. Use `FunctionTypeAliasElement`.
 * Read imports, exports, and parts on demand in `AnalysisDriver`.

pkg/dartdev/lib/src/analytics.dart

@@ -54,39 +54,46 @@ Analytics createAnalyticsInstance(bool disableAnalytics) {
   if (Platform.environment['_DARTDEV_LOG_ANALYTICS'] != null) {
     // Used for testing what analytics messages are sent.
     _instance = _LoggingAnalytics();
-  } else if (disableAnalytics) {
+    return _instance;
+  }
+
+  if (disableAnalytics) {
     // Dartdev tests pass a hidden 'disable-dartdev-analytics' flag which is
     // handled here.
     // Also, stdout.hasTerminal is checked, if there is no terminal we infer that
     // a machine is running dartdev so we return analytics shouldn't be set.
     _instance = DisabledAnalytics(_trackingId, _appName);
-  } else {
-    var settingsDir = getDartStorageDirectory();
-    if (settingsDir == null) {
-      // Some systems don't support user home directories; for those, fail
+    return _instance;
+  }
+
+  var settingsDir = getDartStorageDirectory();
+  if (settingsDir == null) {
+    // Some systems don't support user home directories; for those, fail
+    // gracefully by returning a disabled analytics object.
+    _instance = DisabledAnalytics(_trackingId, _appName);
+    return _instance;
+  }
+
+  if (!settingsDir.existsSync()) {
+    try {
+      settingsDir.createSync();
+    } catch (e) {
+      // If we can't create the directory for the analytics settings, fail
       // gracefully by returning a disabled analytics object.
       _instance = DisabledAnalytics(_trackingId, _appName);
-    } else if (!settingsDir.existsSync()) {
-      try {
-        settingsDir.createSync();
-      } catch (e) {
-        // If we can't create the directory for the analytics settings, fail
-        // gracefully by returning a disabled analytics object.
-        _instance = DisabledAnalytics(_trackingId, _appName);
-      }
-    } else {
-      var readmeFile =
-          File('${settingsDir.absolute.path}${path.separator}$_readmeFileName');
-      if (!readmeFile.existsSync()) {
-        readmeFile.createSync();
-        readmeFile.writeAsStringSync(_readmeFileContents);
-      }
-
-      var settingsFile = File(path.join(settingsDir.path, _settingsFileName));
-      _instance = DartdevAnalytics(_trackingId, settingsFile, _appName);
+      return _instance;
     }
   }
 
+  var readmeFile =
+      File('${settingsDir.absolute.path}${path.separator}$_readmeFileName');
+  if (!readmeFile.existsSync()) {
+    readmeFile.createSync();
+    readmeFile.writeAsStringSync(_readmeFileContents);
+  }
+
+  var settingsFile = File(path.join(settingsDir.path, _settingsFileName));
+  _instance = DartdevAnalytics(_trackingId, settingsFile, _appName);
   return _instance;
 }
 

pkg/dev_compiler/lib/src/kernel/compiler.dart

@@ -3002,12 +3002,49 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
     // size on expression evaluation is better.
     // Issue: https://github.com/dart-lang/sdk/issues/43288
     var fun = _emitFunction(functionNode, name);
-    var items = _typeTable?.discharge();
-    var body = js_ast.Block([...?items, ...fun.body.statements]);
 
+    var types = _typeTable.discharge();
+    var constants = _dischargeConstTable();
+
+    var body = js_ast.Block([...?types, ...?constants, ...fun.body.statements]);
     return js_ast.Fun(fun.params, body);
   }
 
+  /// Emit all collected const symbols
+  ///
+  /// This is similar to how constants are emitted during
+  /// initial compilation in emitModule
+  ///
+  /// TODO: unify the code with emitModule.
+  List<js_ast.Statement> _dischargeConstTable() {
+    var items = <js_ast.Statement>[];
+
+    if (_constLazyAccessors.isNotEmpty) {
+      var constTableBody = runtimeStatement(
+          'defineLazy(#, { # }, false)', [_constTable, _constLazyAccessors]);
+      items.add(constTableBody);
+      _constLazyAccessors.clear();
+    }
+
+    _copyAndFlattenBlocks(items, moduleItems);
+    moduleItems.clear();
+    return items;
+  }
+
+  /// Flattens blocks in [items] to a single list.
+  ///
+  /// This will not flatten blocks that are marked as being scopes.
+  void _copyAndFlattenBlocks(
+      List<js_ast.Statement> result, Iterable<js_ast.ModuleItem> items) {
+    for (var item in items) {
+      if (item is js_ast.Block && !item.isScope) {
+        _copyAndFlattenBlocks(result, item.statements);
+      } else {
+        result.add(item as js_ast.Statement);
+      }
+    }
+  }
+
   js_ast.Fun _emitFunction(FunctionNode f, String name) {
     // normal function (sync), vs (sync*, async, async*)
     var isSync = f.asyncMarker == AsyncMarker.Sync;

pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart

@@ -409,6 +409,28 @@ void main() {
           ))
           ''');
     });
+
+    test('function', () async {
+      await driver.check(
+          scope: <String, String>{'x': '1', 'y': '2', 'z': '3'},
+          expression: 'main',
+          expectedResult: '''
+          (function(x, y, z) {
+            var VoidTodynamic = () => (VoidTodynamic = dart.constFn(dart.fnType(dart.dynamic, [])))();
+            dart.defineLazy(CT, {
+              get C0() {
+                return C0 = dart.fn(foo.main, VoidTodynamic());
+              }
+            }, false);
+            var C0;
+            return C0 || CT.C0;
+          }(
+            1,
+            2,
+            3
+          ))
+          ''');
+    });
   });
 
   group('Expression compiler tests in method:', () {
@@ -1313,7 +1335,16 @@ void main() {
           expression: 'const MyClass(1)',
           expectedResult: '''
           (function(p) {
-            return C0 || CT.C0;
+             dart.defineLazy(CT, {
+               get C0() {
+                 return C0 = dart.const({
+                   __proto__: foo.MyClass.prototype,
+                   [_t]: 1
+                 });
+               }
+             }, false);
+             var C0;
+             return C0 || CT.C0;
           }(
             1
           ))
@@ -1353,6 +1384,15 @@ void main() {
           expression: "const Key('t')",
           expectedResult: '''
           (function(p) {
+            dart.defineLazy(CT, {
+              get C0() {
+                return C0 = dart.const({
+                  __proto__: foo.ValueKey.prototype,
+                  [value]: "t"
+                  });
+                }
+            }, false);
+            var C0;
             return C0 || CT.C0;
           }(
             1