Enable bytecode in AOT compilation pipeline

Change-Id: I3f1bb7d56522cf5dfedf68c022fbed59c3d04717
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/118103
Commit-Queue: Alexander Markov <[email protected]>
Reviewed-by: Ryan Macnak <[email protected]>
Reviewed-by: Siva Annamalai <[email protected]>

Author: alexmarkov

pkg/frontend_server/lib/frontend_server.dart

@@ -148,7 +148,7 @@ ArgParser argParser = ArgParser(allowTrailingOptions: true)
   ..addFlag('track-widget-creation',
       help: 'Run a kernel transformer to track creation locations for widgets.',
       defaultsTo: false)
-  ..addFlag('gen-bytecode', help: 'Generate bytecode', defaultsTo: false)
+  ..addFlag('gen-bytecode', help: 'Generate bytecode', defaultsTo: null)
   ..addMultiOption('bytecode-options',
       help: 'Specify options for bytecode generation:',
       valueHelp: 'opt1,opt2,...',
@@ -374,12 +374,13 @@ class FrontendCompiler implements CompilerInterface {
       return false;
     }
 
-    compilerOptions.bytecode = options['gen-bytecode'];
+    compilerOptions.bytecode = options['gen-bytecode'] ?? options['aot'];
     final BytecodeOptions bytecodeOptions = BytecodeOptions(
-        enableAsserts: options['enable-asserts'],
-        emitSourceFiles: options['embed-source-text'],
-        environmentDefines: environmentDefines)
-      ..parseCommandLineFlags(options['bytecode-options']);
+      enableAsserts: options['enable-asserts'],
+      emitSourceFiles: options['embed-source-text'],
+      environmentDefines: environmentDefines,
+      aot: options['aot'],
+    )..parseCommandLineFlags(options['bytecode-options']);
 
     compilerOptions.target = createFrontEndTarget(
       options['target'],

pkg/vm/lib/bytecode/options.dart

@@ -48,9 +48,15 @@ class BytecodeOptions {
       this.keepUnreachableCode = false,
       this.avoidClosureCallInstructions = false,
       this.showBytecodeSizeStatistics = false,
+      bool aot = false,
       this.environmentDefines = const <String, String>{}}) {
     causalAsyncStacks ??=
         environmentDefines['dart.developer.causal_async_stacks'] == 'true';
+    if (aot) {
+      emitSourcePositions = true;
+      emitLocalVarInfo = true;
+      causalAsyncStacks = true;
+    }
   }
 
   void parseCommandLineFlags(List<String> flags) {

pkg/vm/lib/kernel_front_end.dart

@@ -102,7 +102,7 @@ void declareCompilerOptions(ArgParser args) {
       help:
           'Split resulting kernel file into multiple files (one per package).',
       defaultsTo: false);
-  args.addFlag('gen-bytecode', help: 'Generate bytecode', defaultsTo: false);
+  args.addFlag('gen-bytecode', help: 'Generate bytecode', defaultsTo: null);
   args.addMultiOption('bytecode-options',
       help: 'Specify options for bytecode generation:',
       valueHelp: 'opt1,opt2,...',
@@ -153,7 +153,7 @@ Future<int> runCompiler(ArgResults options, String usage) async {
   final bool tfa = options['tfa'];
   final bool linkPlatform = options['link-platform'];
   final bool embedSources = options['embed-sources'];
-  final bool genBytecode = options['gen-bytecode'];
+  final bool genBytecode = options['gen-bytecode'] ?? aot;
   final bool dropAST = options['drop-ast'];
   final bool enableAsserts = options['enable-asserts'];
   final bool useProtobufTreeShaker = options['protobuf-tree-shaker'];
@@ -166,10 +166,11 @@ Future<int> runCompiler(ArgResults options, String usage) async {
   }
 
   final BytecodeOptions bytecodeOptions = new BytecodeOptions(
-      enableAsserts: enableAsserts,
-      emitSourceFiles: embedSources,
-      environmentDefines: environmentDefines)
-    ..parseCommandLineFlags(options['bytecode-options']);
+    enableAsserts: enableAsserts,
+    emitSourceFiles: embedSources,
+    environmentDefines: environmentDefines,
+    aot: aot,
+  )..parseCommandLineFlags(options['bytecode-options']);
 
   final target = createFrontEndTarget(targetName);
   if (target == null) {

pkg/vm/tool/precompiler2

@@ -31,6 +31,8 @@ for arg in "$@"; do
     ;;
     --tfa | \
     --no-tfa | \
+    --gen-bytecode | \
+    --no-gen-bytecode | \
     -D* )
     GEN_KERNEL_OPTIONS+=("$arg")
     ;;

runtime/vm/compiler/jit/compiler.cc

@@ -108,6 +108,7 @@ static void PrecompilationModeHandler(bool value) {
     FLAG_reorder_basic_blocks = true;
     FLAG_use_field_guards = false;
     FLAG_use_cha_deopt = false;
+    FLAG_use_bytecode_compiler = true;
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
     // Not present with DART_PRECOMPILED_RUNTIME