Version 2.12.0-74.0.dev

Merge commit 'dab1efeb5d471f354dedd15b136420a5bef999af' into 'dev'

Author: Dart CI

pkg/compiler/lib/src/dart2js.dart

@@ -285,6 +285,10 @@ Future<api.CompilationResult> compile(List<String> argv,
   }
 
   void setCfeOnly(String argument) {
+    if (writeStrategy == WriteStrategy.toClosedWorld) {
+      fail("Cannot use ${Flags.cfeOnly} "
+          "and write serialized closed world simultaneously.");
+    }
     if (writeStrategy == WriteStrategy.toData) {
       fail("Cannot use ${Flags.cfeOnly} "
           "and write serialized data simultaneously.");
@@ -644,7 +648,10 @@ Future<api.CompilationResult> compile(List<String> argv,
     case WriteStrategy.toKernel:
       out ??= Uri.base.resolve('out.dill');
       options.add(Flags.cfeOnly);
-      if (readStrategy == ReadStrategy.fromData) {
+      if (readStrategy == ReadStrategy.fromClosedWorld) {
+        fail("Cannot use ${Flags.cfeOnly} "
+            "and read serialized closed world simultaneously.");
+      } else if (readStrategy == ReadStrategy.fromData) {
         fail("Cannot use ${Flags.cfeOnly} "
             "and read serialized data simultaneously.");
       } else if (readStrategy == ReadStrategy.fromCodegen) {

pkg/compiler/test/end_to_end/command_line_test.dart

@@ -27,10 +27,16 @@ main() {
     await test([Flags.cfeOnly], exitCode: 1);
     await test([Flags.cfeOnly, 'foo.dart'], out: 'out.dill');
     await test([Flags.cfeOnly, 'foo.dart', '--out=out.dill'], out: 'out.dill');
+    await test([Flags.cfeOnly, 'foo.dart', Flags.readClosedWorld], exitCode: 1);
+    await test(['foo.dart', Flags.readClosedWorld, Flags.cfeOnly], exitCode: 1);
     await test([Flags.cfeOnly, 'foo.dart', Flags.readData], exitCode: 1);
     await test(['foo.dart', Flags.readData, Flags.cfeOnly], exitCode: 1);
     await test([Flags.cfeOnly, 'foo.dart', Flags.readCodegen], exitCode: 1);
     await test(['foo.dart', Flags.readCodegen, Flags.cfeOnly], exitCode: 1);
+    await test([Flags.cfeOnly, 'foo.dart', Flags.writeClosedWorld],
+        exitCode: 1);
+    await test(['foo.dart', Flags.writeClosedWorld, Flags.cfeOnly],
+        exitCode: 1);
     await test([Flags.cfeOnly, 'foo.dart', Flags.writeData], exitCode: 1);
     await test(['foo.dart', Flags.writeData, Flags.cfeOnly], exitCode: 1);
     await test([Flags.cfeOnly, 'foo.dart', Flags.writeCodegen], exitCode: 1);
@@ -40,11 +46,51 @@ main() {
         out: 'out.dill', writeData: 'out.dill.data');
     await test(['${Flags.writeData}=foo.data', 'foo.dart', '--out=foo.dill'],
         out: 'foo.dill', writeData: 'foo.data');
+    await test([Flags.readClosedWorld, Flags.writeClosedWorld, 'foo.dart'],
+        exitCode: 1);
+    await test([Flags.writeClosedWorld, Flags.readClosedWorld, 'foo.dart'],
+        exitCode: 1);
     await test([Flags.readData, Flags.writeData, 'foo.dart'], exitCode: 1);
     await test([Flags.writeData, Flags.readData, 'foo.dart'], exitCode: 1);
+    await test([Flags.readCodegen, Flags.writeClosedWorld, 'foo.dart'],
+        exitCode: 1);
     await test([Flags.readCodegen, Flags.writeData, 'foo.dart'], exitCode: 1);
+    await test([Flags.writeClosedWorld, Flags.readData, 'foo.dart'],
+        exitCode: 1);
+    await test([Flags.writeClosedWorld, Flags.readCodegen, 'foo.dart'],
+        exitCode: 1);
     await test([Flags.writeData, Flags.readCodegen, 'foo.dart'], exitCode: 1);
 
+    await test([
+      Flags.writeClosedWorld,
+      'foo.dart',
+    ], out: 'out.dill', writeClosedWorld: 'out.dill.world');
+    await test(
+        ['${Flags.writeClosedWorld}=foo.world', 'foo.dart', '--out=foo.dill'],
+        out: 'foo.dill', writeClosedWorld: 'foo.world');
+
+    await test([Flags.readClosedWorld, 'foo.dill'],
+        out: 'out.js', readClosedWorld: 'foo.dill.world');
+    await test([Flags.readClosedWorld, 'foo.dill', '--out=foo.js'],
+        out: 'foo.js', readClosedWorld: 'foo.dill.world');
+    await test(['${Flags.readClosedWorld}=out.world', 'foo.world'],
+        out: 'out.js', readClosedWorld: 'out.world');
+    await test(
+        ['${Flags.readClosedWorld}=out.world', 'foo.world', '--out=foo.js'],
+        out: 'foo.js', readClosedWorld: 'out.world');
+    await test(
+      [Flags.readClosedWorld, Flags.writeData, 'foo.dill'],
+      out: 'out.dill',
+      readClosedWorld: 'foo.dill.world',
+      writeData: 'out.dill.data',
+    );
+    await test([
+      '${Flags.readClosedWorld}=foo.world',
+      '${Flags.writeData}=foo.data',
+      'foo.dart',
+      '--out=foo.dill'
+    ], out: 'foo.dill', readClosedWorld: 'foo.world', writeData: 'foo.data');
+
     await test([Flags.readData, 'foo.dill'],
         out: 'out.js', readData: 'foo.dill.data');
     await test([Flags.readData, 'foo.dill', '--out=foo.js'],
@@ -199,6 +245,8 @@ main() {
 Future test(List<String> arguments,
     {int exitCode,
     String out,
+    String readClosedWorld,
+    String writeClosedWorld,
     String readData,
     String writeData,
     String readCodegen,
@@ -231,6 +279,10 @@ Future test(List<String> arguments,
   if (actualExitCode == null) {
     Expect.isNotNull(options, "Missing options object");
     Expect.equals(toUri(out), options.outputUri, "Unexpected output uri.");
+    Expect.equals(toUri(readClosedWorld), options.readClosedWorldUri,
+        "Unexpected readClosedWorld uri");
+    Expect.equals(toUri(writeClosedWorld), options.writeClosedWorldUri,
+        "Unexpected writeClosedWorld uri");
     Expect.equals(
         toUri(readData), options.readDataUri, "Unexpected readData uri");
     Expect.equals(

pkg/kernel/lib/ast.dart

@@ -9829,7 +9829,7 @@ abstract class BinarySource {
 
   int readByte();
   List<int> readBytes(int length);
-  int readUInt();
+  int readUInt30();
   int readUint32();
 
   /// Read List<Byte> from the source.