diff options
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 14027493d8..9196eb2ca3 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -239,7 +239,7 @@ Runtime::Runtime() exit_(nullptr), abort_(nullptr), stats_enabled_(false), - is_running_on_memory_tool_(RUNNING_ON_MEMORY_TOOL), + is_running_on_memory_tool_(kRunningOnMemoryTool), instrumentation_(), main_thread_group_(nullptr), system_thread_group_(nullptr), @@ -1349,8 +1349,10 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { case InstructionSet::kMips: case InstructionSet::kMips64: implicit_null_checks_ = true; - // Installing stack protection does not play well with valgrind. - implicit_so_checks_ = !(RUNNING_ON_MEMORY_TOOL && kMemoryToolIsValgrind); + // Installing stack protection does not play well with Valgrind. + // TODO: Valgrind is no longer supported, but Address Sanitizer is: + // check whether setting `implicit_so_checks_` to `true` works with ASan. + implicit_so_checks_ = !kRunningOnMemoryTool; break; default: // Keep the defaults. @@ -1365,8 +1367,8 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { // These need to be in a specific order. The null point check handler must be // after the suspend check and stack overflow check handlers. // - // Note: the instances attach themselves to the fault manager and are handled by it. The manager - // will delete the instance on Shutdown(). + // Note: the instances attach themselves to the fault manager and are handled by it. The + // manager will delete the instance on Shutdown(). if (implicit_suspend_checks_) { new SuspensionHandler(&fault_manager); } |