[ddc] Fix passing module format to ExpressionCompiler

The DDC library bundle format is a combination of the DDC
format and canary, so therefore check that's the case, and if
so, pass the library bundle format.

Change-Id: I067d2b020e75b703a30fbe7d5f8dc2d31cd4878c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/396420
Reviewed-by: Nicholas Shahan <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Srujan Gaddam <[email protected]>

Author: srujzs

pkg/dev_compiler/lib/src/kernel/expression_compiler_worker.dart

@@ -504,7 +504,9 @@ class ExpressionCompilerWorker {
 
     expressionCompiler = ExpressionCompiler(
       _compilerOptions,
-      _moduleFormat,
+      _moduleFormat == ModuleFormat.ddc && _canaryFeatures
+          ? ModuleFormat.ddcLibraryBundle
+          : _moduleFormat,
       errors,
       incrementalCompiler,
       kernel2jsCompiler,

pkg/frontend_server/lib/frontend_server.dart

@@ -18,7 +18,12 @@ import 'dart:typed_data' show BytesBuilder;
 
 import 'package:args/args.dart';
 import 'package:dev_compiler/dev_compiler.dart'
-    show Compiler, DevCompilerTarget, ExpressionCompiler, parseModuleFormat;
+    show
+        Compiler,
+        DevCompilerTarget,
+        ExpressionCompiler,
+        ModuleFormat,
+        parseModuleFormat;
 import 'package:front_end/src/api_prototype/macros.dart' as macros
     show isMacroLibraryUri;
 import 'package:front_end/src/api_unstable/ddc.dart' as ddc
@@ -1139,9 +1144,16 @@ class FrontendCompiler implements CompilerInterface {
 
     _processedOptions.ticker.logMs('Computed component');
 
+    ModuleFormat moduleFormat =
+        parseModuleFormat(_options['dartdevc-module-format'] as String);
+    final bool canaryFeatures = _options['dartdevc-canary'] as bool;
+    if (moduleFormat == ModuleFormat.ddc && canaryFeatures) {
+      moduleFormat = ModuleFormat.ddcLibraryBundle;
+    }
+
     final ExpressionCompiler expressionCompiler = new ExpressionCompiler(
       _compilerOptions,
-      parseModuleFormat(_options['dartdevc-module-format'] as String),
+      moduleFormat,
       errors,
       _generator.generator as ddc.IncrementalCompiler,
       kernel2jsCompiler,