| commit | db6b8dc220d5c2372365a971c41b83d7874f9d6a | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Thu Nov 27 18:16:27 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 27 18:16:29 2014 +0000 |
| tree | f79b55adfb2963a6772cdeeac0a840d542cf54f7 | |
| parent | 20e11a7956eaebf97d7ed44bbca1c42948b3a580 [diff] | |
| parent | 56bf0c793d461cc2f9c37ab8fce79a268fd700e0 [diff] |
Merge "Disable stack mprotects when running on valgrind" into lmp-mr1-dev
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index bcfb2fe..d6cafcc 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc
@@ -760,7 +760,7 @@ case kArm64: case kX86_64: implicit_null_checks_ = true; - implicit_so_checks_ = true; + implicit_so_checks_ = (RUNNING_ON_VALGRIND == 0); break; default: // Keep the defaults.