[vm] Fix bytecode in core-jit for simarm64

simarm64 doesn't support --enable_interpreter, so we need
another way to get bytecode into the core-jit snapshot.
For this it makes sense to use --use_bytecode_compiler
since we'll need to switch to the bytecode-only pipeline
at some point anyway.

Change-Id: I761acd0439663cb488c3d2143cbaa8f96f9a0a4b
Reviewed-on: https://dart-review.googlesource.com/c/79180
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Zach Anderson <zra@google.com>

runtime/bin/gen_snapshot.cc

@@ -550,7 +550,8 @@ static void CreateAndWriteDependenciesFile() {
 }
 
 static void LoadBytecode() {
-  if (Dart_IsVMFlagSet("enable_interpreter") &&
+  if ((Dart_IsVMFlagSet("enable_interpreter") ||
+       Dart_IsVMFlagSet("use_bytecode_compiler")) &&
       ((snapshot_kind == kCoreJIT) || (snapshot_kind == kAppJIT))) {
     Dart_Handle result = Dart_ReadAllBytecode();
     CHECK_RESULT(result);

runtime/bin/main.cc

@@ -773,7 +773,8 @@ static void ReadFile(const char* filename, uint8_t** buffer, intptr_t* size) {
 }
 
 static void LoadBytecode() {
-  if (Dart_IsVMFlagSet("enable_interpreter")) {
+  if (Dart_IsVMFlagSet("enable_interpreter") ||
+      Dart_IsVMFlagSet("use_bytecode_compiler")) {
     Dart_Handle result = Dart_ReadAllBytecode();
     CHECK_RESULT(result);
   }

runtime/vm/clustered_snapshot.cc

@@ -710,8 +710,13 @@ class FunctionDeserializationCluster : public DeserializationCluster {
           func.SetInstructions(code);  // Set entrypoint.
           func.SetWasCompiled(true);
 #if !defined(DART_PRECOMPILED_RUNTIME)
-        } else if (func.HasBytecode() && !code.IsDisabled()) {
-          func.SetInstructions(code);  // Set entrypoint.
+        } else if (FLAG_enable_interpreter && func.HasBytecode()) {
+          // Set the code entry_point to InterpretCall stub.
+          func.SetInstructions(
+              Code::Handle(StubCode::InterpretCall_entry()->code()));
+        } else if (FLAG_use_bytecode_compiler && func.HasBytecode()) {
+          func.SetInstructions(
+              Code::Handle(StubCode::LazyCompile_entry()->code()));
 #endif                                 // !defined(DART_PRECOMPILED_RUNTIME)
         } else {
           func.ClearCode();  // Set code and entrypoint to lazy compile stub.

runtime/vm/compiler/jit/compiler.cc

@@ -1346,7 +1346,8 @@ RawError* Compiler::ReadAllBytecode(const Class& cls) {
   for (int i = 0; i < functions.Length(); i++) {
     func ^= functions.At(i);
     ASSERT(!func.IsNull());
-    if (func.IsBytecodeAllowed(zone) && !func.HasBytecode()) {
+    if (func.IsBytecodeAllowed(zone) && !func.HasBytecode() &&
+        !func.HasCode()) {
       RawError* error =
           kernel::BytecodeReader::ReadFunctionBytecode(thread, func);
       if (error != Error::null()) {