[vm] Prevent bare instructions code from clobbering decisions about which instructions to include.

rmacnak-google · commit-bot@chromium.org · commit 901fa79db1b6 · 2020-07-06T17:56:51.000Z
The ImageWriter is meant to include exactly those instructions passed to GetTextOffset, which isn't necessarily the current Instructions for every Code object. Bug: #41974 Change-Id: I77f09c70fd45f387f4802b30a86b155506529e29 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153043 Reviewed-by: Martin Kustermann <kustermann@google.com> Commit-Queue: Ryan Macnak <rmacnak@google.com>
diff --git a/runtime/vm/clustered_snapshot.cc b/runtime/vm/clustered_snapshot.cc
@@ -5333,7 +5333,7 @@ void Serializer::Serialize() {
 
   intptr_t code_order_length = 0;
 #if defined(DART_PRECOMPILER) && !defined(TARGET_ARCH_IA32)
-  if (kind_ == Snapshot::kFullAOT) {
+  if ((kind_ == Snapshot::kFullAOT) && FLAG_use_bare_instructions) {
     auto code_objects =
         static_cast<CodeSerializationCluster*>(clusters_by_cid_[kCodeCid])
             ->discovered_objects();
