diff options
| -rw-r--r-- | compiler/optimizing/code_generator_arm64.cc | 5 | ||||
| -rw-r--r-- | runtime/parsed_options.cc | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 8faaec1de7..4955562f82 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -90,8 +90,9 @@ static constexpr uint32_t kPackedSwitchCompareJumpThreshold = 7; constexpr uint32_t kReferenceLoadMinFarOffset = 16 * KB; // Flags controlling the use of link-time generated thunks for Baker read barriers. -constexpr bool kBakerReadBarrierLinkTimeThunksEnableForFields = true; -constexpr bool kBakerReadBarrierLinkTimeThunksEnableForGcRoots = true; +// Not yet implemented for heap poisoning. +constexpr bool kBakerReadBarrierLinkTimeThunksEnableForFields = !kPoisonHeapReferences; +constexpr bool kBakerReadBarrierLinkTimeThunksEnableForGcRoots = !kPoisonHeapReferences; // Some instructions have special requirements for a temporary, for example // LoadClass/kBssEntry and LoadString/kBssEntry for Baker read barrier require diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index 0784e599b5..8ffd8bbc90 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -476,7 +476,10 @@ bool ParsedOptions::DoParse(const RuntimeOptions& options, Usage(nullptr); return false; } else if (args.Exists(M::ShowVersion)) { - UsageMessage(stdout, "ART version %s\n", Runtime::GetVersion()); + UsageMessage(stdout, + "ART version %s %s\n", + Runtime::GetVersion(), + GetInstructionSetString(kRuntimeISA)); Exit(0); } else if (args.Exists(M::BootClassPath)) { LOG(INFO) << "setting boot class path to " << *args.Get(M::BootClassPath); |