Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 327db5e

Browse files
zandersocommit-bot@chromium.org
authored andcommitted
[vm] Fix kernel_isolate use_field_guard flag for kbc
Change-Id: Iaebc204c57cff9d01e1be3db9b2c16ca3a839c38 Reviewed-on: https://dart-review.googlesource.com/69006 Reviewed-by: Ryan Macnak <[email protected]> Reviewed-by: Régis Crelier <[email protected]> Commit-Queue: Zach Anderson <[email protected]>
1 parent a1ca88f commit 327db5e

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

runtime/vm/clustered_snapshot.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5357,7 +5357,7 @@ RawApiError* Deserializer::VerifyVersionAndFeatures(Isolate* isolate) {
53575357
const intptr_t kMessageBufferSize = 1024;
53585358
char message_buffer[kMessageBufferSize];
53595359
char* actual_features =
5360-
Utils::StrNDup(features, buffer_len < 128 ? buffer_len : 128);
5360+
Utils::StrNDup(features, buffer_len < 1024 ? buffer_len : 1024);
53615361
Utils::SNPrint(message_buffer, kMessageBufferSize,
53625362
"Snapshot not compatible with the current VM configuration: "
53635363
"the snapshot requires '%s' but the VM has '%s'",

runtime/vm/dart.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,11 @@ const char* Dart::FeaturesString(Isolate* isolate,
719719
#else
720720
buffer.AddString(" x64-sysv");
721721
#endif
722+
723+
#if defined(DART_USE_INTERPRETER)
724+
buffer.AddString(" kbc");
725+
#endif
726+
722727
#elif defined(TARGET_ARCH_DBC)
723728
#if defined(ARCH_IS_32_BIT)
724729
buffer.AddString(" dbc32");

runtime/vm/kernel_isolate.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ class RunKernelTask : public ThreadPool::Task {
9595
api_flags.reify_generic_functions = false;
9696
api_flags.strong = false;
9797
api_flags.sync_async = false;
98-
#if !defined(DART_PRECOMPILER) && !defined(TARGET_ARCH_DBC)
98+
#if !defined(DART_PRECOMPILER) && !defined(TARGET_ARCH_DBC) && \
99+
!defined(DART_USE_INTERPRETER)
99100
api_flags.use_field_guards = true;
100101
#endif
101102
#if !defined(DART_PRECOMPILER)

0 commit comments

Comments
 (0)