diff options
| author | Dave Allison <dallison@google.com> | 2014-05-09 22:04:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-09 22:04:58 +0000 |
| commit | 537aaf122b93cd72e3e886831c686c3b2f83e441 (patch) | |
| tree | f9befe6e1af737b97eec9aa334039ef1591be7a2 /runtime/runtime.cc | |
| parent | 9d7546662eb7138a7263f12f70d884554483a5a6 (diff) | |
| parent | ad9697a91d5acdc772ae6c0461540bfec358a070 (diff) | |
| download | art-537aaf122b93cd72e3e886831c686c3b2f83e441.zip art-537aaf122b93cd72e3e886831c686c3b2f83e441.tar.gz art-537aaf122b93cd72e3e886831c686c3b2f83e441.tar.bz2 | |
Merge "Revert "Switch on implicit null pointer and stack overflow checks.""
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index d84824a..d78be92 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -535,20 +535,9 @@ bool Runtime::Init(const Options& raw_options, bool ignore_unrecognized) { GetInstrumentation()->ForceInterpretOnly(); } - bool implicit_checks_supported = false; - switch (kRuntimeISA) { - case kArm: - case kThumb2: - implicit_checks_supported = true; - break; - default: - break; - } - - if (implicit_checks_supported && - (options->explicit_checks_ != (ParsedOptions::kExplicitSuspendCheck | + if (options->explicit_checks_ != (ParsedOptions::kExplicitSuspendCheck | ParsedOptions::kExplicitNullCheck | - ParsedOptions::kExplicitStackOverflowCheck) || kEnableJavaStackTraceHandler)) { + ParsedOptions::kExplicitStackOverflowCheck) || kEnableJavaStackTraceHandler) { fault_manager.Init(); // These need to be in a specific order. The null point check handler must be |