Version 3.3.0-161.0.dev

Merge e0116d3 into dev

pkg/compiler/lib/src/js_emitter/startup_emitter/emitter.dart

@@ -242,8 +242,8 @@ class EmitterImpl extends ModularEmitterBase implements Emitter {
   @override
   Map<OutputUnit, int> get generatedSizes {
     final mappedSizes = <OutputUnit, int>{};
-    _emitter.emittedOutputBuffers.forEach((outputUnit, outputData) {
-      mappedSizes[outputUnit] = outputData.length;
+    _emitter.emittedOutputSizes.forEach((outputUnit, dataLength) {
+      mappedSizes[outputUnit] = dataLength;
     });
     _emitter.omittedOutputUnits
         .forEach((outputUnit) => mappedSizes[outputUnit] = 0);

pkg/compiler/lib/src/js_emitter/startup_emitter/model_emitter.dart

@@ -119,8 +119,8 @@ class ModelEmitter {
   final SourceInformationStrategy _sourceInformationStrategy;
   final FragmentMerger fragmentMerger;
 
-  // The full code that is written to each hunk part-file.
-  final Map<OutputUnit, CodeOutput> emittedOutputBuffers = {};
+  // The length of the code that is written to each hunk part-file.
+  final Map<OutputUnit, int> emittedOutputSizes = {};
 
   final Set<OutputUnit> omittedOutputUnits = {};
 
@@ -360,7 +360,7 @@ class ModelEmitter {
     }
 
     // Return the total program size.
-    return emittedOutputBuffers.values.fold(0, (a, b) => a + b.length);
+    return emittedOutputSizes.values.fold(0, (a, b) => a + b);
   }
 
   /// Generates a simple header that provides the compiler's build id.
@@ -433,7 +433,6 @@ var ${startupMetricsGlobal} =
     CodeOutput mainOutput = StreamCodeOutput(
         _outputProvider.createOutputSink('', 'js', api.OutputType.js),
         codeOutputListeners);
-    emittedOutputBuffers[fragment.outputUnit] = mainOutput;
 
     js.Program program = js.Program([
       buildGeneratedBy(),
@@ -461,6 +460,7 @@ var ${startupMetricsGlobal} =
     }
 
     mainOutput.close();
+    emittedOutputSizes[fragment.outputUnit] = mainOutput.length;
 
     if (_shouldGenerateSourceMap) {
       _task.measureSubtask('source-maps', () {
@@ -540,6 +540,11 @@ var ${startupMetricsGlobal} =
     } else {
       output.close();
     }
+    for (final fragment in fragmentCode) {
+      for (final outputUnit in fragment.codeFragment.outputUnits) {
+        emittedOutputSizes[outputUnit] = output.length;
+      }
+    }
   }
 
   /// Writes a list of [CodeFragments] to [CodeOutput].
@@ -552,9 +557,6 @@ var ${startupMetricsGlobal} =
     for (var emittedCodeFragment in fragmentCode) {
       var codeFragment = emittedCodeFragment.codeFragment;
       var code = emittedCodeFragment.code;
-      for (var outputUnit in codeFragment.outputUnits) {
-        emittedOutputBuffers[outputUnit] = output;
-      }
       fragmentHashes[codeFragment] =
           writeCodeFragment(output, code, isFirst, outputFileName);
       isFirst = false;

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 3
 PATCH 0
-PRERELEASE 160
+PRERELEASE 161
 PRERELEASE_PATCH 0