---

yaml
---
r: 361531
b: refs/heads/handle-null-safety
c: 33d3836
h: refs/heads/main
i:
  361529: 65c2e5c
  361527: dcc9a58

Author: grouma

[refs]

@@ -2840,4 +2840,4 @@ refs/tags/2.17.0-98.0.dev: d638f5cd14034bdeb1e2f46e3c5e7a8bc132186d
 refs/tags/2.17.0-99.0.dev: 28e0edfed7b7be0329925388d643aa852a7c4519
 refs/heads/Show-issue-template: b53d5db7145036ec770de8b356d93228b592ccd7
 "refs/heads/dart2js_json": 7a4771a7a1372b0511fe252af81f64e2ee4c37ab
-refs/heads/handle-null-safety: 346a9c48a51d651f125abdc27cf54b8b9ecbbb45
+refs/heads/handle-null-safety: 33d38366f01f44b32f99c40d4ab664c557dee593

branches/handle-null-safety/pkg/frontend_server/lib/compute_kernel.dart

@@ -237,12 +237,21 @@ Future<ComputeKernelResult> computeKernel(List<String> args,
   List<Uri> summaryInputs =
       (parsedArgs['input-summary'] as List<String>).map(toUri).toList();
 
+  fe.InitializedCompilerState state;
+  bool usingIncrementalCompiler = false;
+  bool recordUsedInputs = parsedArgs["used-inputs"] != null;
+  var environmentDefines = _parseEnvironmentDefines(parsedArgs['define']);
+  var verbose = parsedArgs['verbose'] as bool;
+  var verbosity = fe.Verbosity.parseArgument(parsedArgs['verbosity']);
+  Uri? sdkSummaryUri = toUriNullable(parsedArgs['dart-sdk-summary']);
+
   Map<Uri, Uri> redirectsToFrom = {};
   for (String redirect in parsedArgs['redirect']) {
     List<String> split = redirect.split("|");
     if (split.length != 2) throw "Invalid redirect input: '$redirect'";
     redirectsToFrom[toUri(split[1])] = toUri(split[0]);
   }
+
   if (redirectsToFrom.isNotEmpty) {
     // If redirecting from a->b and we were asked to compile b, we want
     // the output to look like we compiled a.
@@ -260,15 +269,15 @@ Future<ComputeKernelResult> computeKernel(List<String> args,
     // actually return data from b. If asked to read b throw.
     fe.InitializedCompilerState helper = fe.initializeCompiler(
         null,
-        toUriNullable(parsedArgs['dart-sdk-summary']),
+        sdkSummaryUri,
         toUriNullable(parsedArgs['libraries-file']),
         toUriNullable(parsedArgs['packages-file']),
         [...summaryInputs, ...linkedInputs],
         target,
         fileSystem,
         parsedArgs['enable-experiment'] as List<String>,
-        {},
-        verbose: false,
+        environmentDefines,
+        verbose: verbose,
         nnbdMode: nnbdMode);
     var uriTranslator = await helper.processedOpts.getUriTranslator();
     _FakeFileSystem ffs = fileSystem = new _FakeFileSystem(fileSystem);
@@ -279,14 +288,6 @@ Future<ComputeKernelResult> computeKernel(List<String> args,
     }
   }
 
-  fe.InitializedCompilerState state;
-  bool usingIncrementalCompiler = false;
-  bool recordUsedInputs = parsedArgs["used-inputs"] != null;
-  var environmentDefines = _parseEnvironmentDefines(parsedArgs['define']);
-  var verbose = parsedArgs['verbose'] as bool;
-  var verbosity = fe.Verbosity.parseArgument(parsedArgs['verbosity']);
-  Uri? sdkSummaryUri = toUriNullable(parsedArgs['dart-sdk-summary']);
-
   if (parsedArgs['use-incremental-compiler']) {
     usingIncrementalCompiler = true;