summaryrefslogtreecommitdiffstats
path: root/runtime/parsed_options.cc
diff options
context:
space:
mode:
authorDave Allison <dallison@google.com>2014-03-20 14:45:17 -0700
committerDave Allison <dallison@google.com>2014-03-20 23:59:41 +0000
commitdd2e825efc755d87503b32cfecbe9fe8e125ee86 (patch)
tree4e29dd6a929585115b721bf1d3be10a1279b3d6f /runtime/parsed_options.cc
parent22e4a507b52cf192ef68c4e4ff9efbccea34eba5 (diff)
downloadart-dd2e825efc755d87503b32cfecbe9fe8e125ee86.zip
art-dd2e825efc755d87503b32cfecbe9fe8e125ee86.tar.gz
art-dd2e825efc755d87503b32cfecbe9fe8e125ee86.tar.bz2
Fix issue parsing implicit_checks property
It was missing the initial value. Change-Id: Id7554c9286947791a46358b0c07339e4d0eac1ee
Diffstat (limited to 'runtime/parsed_options.cc')
-rw-r--r--runtime/parsed_options.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 5717689..9b1c013 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -203,11 +203,13 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni
std::string checks(buf);
std::vector<std::string> checkvec;
Split(checks, ',', checkvec);
+ explicit_checks_ = kExplicitNullCheck | kExplicitSuspendCheck |
+ kExplicitStackOverflowCheck;
for (auto& str : checkvec) {
std::string val = Trim(str);
if (val == "none") {
explicit_checks_ = kExplicitNullCheck | kExplicitSuspendCheck |
- kExplicitStackOverflowCheck;
+ kExplicitStackOverflowCheck;
} else if (val == "null") {
explicit_checks_ &= ~kExplicitNullCheck;
} else if (val == "suspend") {