Do not use pkg/vm wrapper script when running fully-linked kernel files

Issue #31585

Change-Id: I5211c7d8fb16ea60509916bf525cc36ac05dd3a9
Reviewed-on: https://dart-review.googlesource.com/29591
Reviewed-by: Vyacheslav Egorov <[email protected]>
Commit-Queue: Martin Kustermann <[email protected]>

Author: mkustermann

tools/testing/dart/compiler_configuration.dart

@@ -228,8 +228,8 @@ class VMKernelCompilerConfiguration extends CompilerConfiguration
     final commands = <Command>[
       computeCompileToKernelCommand(tempDir, arguments, environmentOverrides),
     ];
-    return new CommandArtifact(
-        commands, tempKernelFile(tempDir), 'application/kernel-ir');
+    return new CommandArtifact(commands, tempKernelFile(tempDir),
+        'application/kernel-ir-fully-linked');
   }
 
   List<String> computeRuntimeArguments(
@@ -242,6 +242,8 @@ class VMKernelCompilerConfiguration extends CompilerConfiguration
     var args = <String>[];
     if (_isStrong) {
       args.add('--strong');
+      args.add('--reify-generic-functions');
+      args.add('--limit-ints-to-64-bits');
     }
     if (_isChecked) {
       args.add('--enable_asserts');

tools/testing/dart/runtime_configuration.dart

@@ -226,10 +226,19 @@ class StandaloneDartRuntimeConfiguration extends DartVmRuntimeConfiguration {
     if (script != null &&
         type != 'application/dart' &&
         type != 'application/dart-snapshot' &&
-        type != 'application/kernel-ir') {
+        type != 'application/kernel-ir' &&
+        type != 'application/kernel-ir-fully-linked') {
       throw "Dart VM cannot run files of type '$type'.";
     }
+
     String executable = suite.dartVmBinaryFileName;
+    if (type == 'application/kernel-ir-fully-linked') {
+      // We don't use the pkg/vm/tool/dart2 wrapper script for fully linked
+      // kernel files, since we don't want to pass the --dfe/--kernel-binaries
+      // flags to the VM (the vm cannot distinguish fully-linked vs
+      // not-fully-linked, see http://dartbug.com/31545)
+      executable = suite.dartVmExecutableFileName;
+    }
     return [Command.vm(executable, arguments, environmentOverrides)];
   }
 }

tools/testing/dart/test_suite.dart

@@ -177,16 +177,19 @@ abstract class TestSuite {
     }
 
     if (dartExecutable == null) {
-      var suffix = executableBinarySuffix;
-      dartExecutable = useSdk
-          ? '$buildDir/dart-sdk/bin/dart$suffix'
-          : '$buildDir/dart$suffix';
+      dartExecutable = dartVmExecutableFileName;
     }
 
     TestUtils.ensureExists(dartExecutable, configuration);
     return dartExecutable;
   }
 
+  String get dartVmExecutableFileName {
+    return useSdk
+        ? '$buildDir/dart-sdk/bin/dart$executableBinarySuffix'
+        : '$buildDir/dart$executableBinarySuffix';
+  }
+
   /// Returns the name of the flutter engine executable.
   String get flutterEngineBinaryFileName {
     // Controlled by user with the option "--flutter".