[dart2wasm] Make optimized builders run with --use-sdk (and therefore dart compile wasm)

This gives some more coverage for `dart compile wasm`

Change-Id: I62e7f9c6ecbdf80a1445c35d1733a7f89e6bcf54
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/366623
Reviewed-by: Ömer Ağacan <omersa@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>

pkg/dart2wasm/tool/compile_benchmark

@@ -120,6 +120,11 @@ while [ $# -gt 0 ]; do
       shift
       ;;
 
+    --extra-compiler-option=*)
+      DART2WASM_ARGS+=(${1#--extra-compiler-option=})
+      shift
+      ;;
+
     --* | -*)
       DART2WASM_ARGS+=("$1")
       shift

pkg/dartdev/lib/src/commands/compile.dart

@@ -769,7 +769,7 @@ class CompileWasmCommand extends CompileSubcommandCommand {
     })
         .toList();
     handleOverride(optimizationFlags, 'minify',
-        args.wasParsed('minify') ? null : args.flag('minify'));
+        args.wasParsed('minify') ? args.flag('minify') : null);
 
     final enabledExperiments = args.enabledExperiments;
     final dart2wasmCommand = [

pkg/test_runner/lib/src/compiler_configuration.dart

@@ -539,12 +539,7 @@ class Dart2WasmCompilerConfiguration extends CompilerConfiguration {
   List<String> computeCompilerArguments(
       TestFile testFile, List<String> vmOptions, List<String> args) {
     return [
-      if (_useSdk) ...[
-        'compile',
-        'wasm',
-      ] else ...[
-        if (_enableHostAsserts) '--compiler-asserts',
-      ],
+      if (!_useSdk && _enableHostAsserts) '--compiler-asserts',
       ...testFile.sharedOptions,
       ..._configuration.sharedOptions,
       ..._experimentsArgument(_configuration, testFile),
@@ -557,6 +552,10 @@ class Dart2WasmCompilerConfiguration extends CompilerConfiguration {
   Command computeCompilationCommand(String outputFileName,
       List<String> arguments, Map<String, String> environmentOverrides) {
     arguments = [
+      if (_useSdk) ...[
+        'compile',
+        'wasm',
+      ],
       ...arguments,
       if (_useSdk) '-o',
       outputFileName,

tests/web/wasm/delete_tostring2_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// dart2wasmOptions=--delete-tostring-package-uri=package:smith
+// dart2wasmOptions=--extra-compiler-option=--delete-tostring-package-uri=package:smith
 
 import 'package:expect/expect.dart';
 

tests/web/wasm_js_shared/omit_implicit_checks_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // dart2jsOptions=--omit-implicit-checks
-// dart2wasmOptions=--omit-implicit-checks
+// dart2wasmOptions=--extra-compiler-option=--omit-implicit-checks
 
 import 'package:expect/expect.dart';
 import 'package:expect/config.dart';

tools/bots/test_matrix.json

@@ -80,6 +80,7 @@
       "out/ReleaseX64/dart2wasm_platform.dill",
       "out/ReleaseX64/dart2wasm_js_compatibility_outline.dill",
       "out/ReleaseX64/dart2wasm_js_compatibility_platform.dill",
+      "out/ReleaseX64/dart-sdk/",
       "out/ReleaseX64/wasm/",
       "out/ReleaseX64/wasm-opt",
       "pkg/",
@@ -469,6 +470,7 @@
         "dart2wasm-options": [
           "-O1"
         ],
+        "use-sdk": true,
         "host-asserts": false,
         "timeout": 60
       }
@@ -2535,7 +2537,8 @@
           "script": "tools/build.py",
           "arguments": [
             "runtime",
-            "dart2wasm"
+            "dart2wasm",
+            "create_sdk"
           ]
         },
         {