diff options
| author | 2014-07-10 01:55:25 +0000 | |
|---|---|---|
| committer | 2014-07-09 14:42:04 +0000 | |
| commit | 672f8367f74e5db7d26714cd6fa1a13fa2a6c59f (patch) | |
| tree | 4becd76b50de9b80dd1fb411a1891bacbe4c77c3 /runtime/parsed_options.cc | |
| parent | 4770a2e6d56398a6b4398fcce14fea43394e0d1b (diff) | |
| parent | 3d14eb620716e92c21c4d2c2d11a95be53319791 (diff) | |
Merge "Revert "Add implicit null and stack checks for x86""
Diffstat (limited to 'runtime/parsed_options.cc')
| -rw-r--r-- | runtime/parsed_options.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index 333ba03f0e..e1e133f1be 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -286,8 +286,8 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni } } #else - // Host. Only suspend check is explicit by default. - explicit_checks_ = kExplicitSuspendCheck; + explicit_checks_ = kExplicitNullCheck | kExplicitSuspendCheck | + kExplicitStackOverflowCheck; #endif for (size_t i = 0; i < options.size(); ++i) { @@ -305,7 +305,6 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni Exit(0); } else if (StartsWith(option, "-Xbootclasspath:")) { boot_class_path_string_ = option.substr(strlen("-Xbootclasspath:")).data(); - LOG(INFO) << "setting boot class path to " << boot_class_path_string_; } else if (option == "-classpath" || option == "-cp") { // TODO: support -Djava.class.path i++; |