summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Allison <dallison@google.com>2014-05-30 11:25:06 -0700
committerDave Allison <dallison@google.com>2014-05-30 11:25:06 -0700
commitc0cf944b21ff07963660b780fd5d3701cc9215ab (patch)
tree59eff6400589de38d430efcc4eb6c565f02f2ade
parent6a7f45ee5401d3d0a5af8ce68bc3b22ae6d85555 (diff)
downloadart-c0cf944b21ff07963660b780fd5d3701cc9215ab.zip
art-c0cf944b21ff07963660b780fd5d3701cc9215ab.tar.gz
art-c0cf944b21ff07963660b780fd5d3701cc9215ab.tar.bz2
Switch on implicit checks and bump oat version to force recompilation
This switches on the compiler's implicit null pointer and stack overflow checks. These use signals Change-Id: I7b536784bbca5f07e30379881a1eea6ab4c258ac
-rw-r--r--runtime/oat.cc2
-rw-r--r--runtime/parsed_options.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/oat.cc b/runtime/oat.cc
index 9c14a4f..4c4dddb 100644
--- a/runtime/oat.cc
+++ b/runtime/oat.cc
@@ -22,7 +22,7 @@
namespace art {
const uint8_t OatHeader::kOatMagic[] = { 'o', 'a', 't', '\n' };
-const uint8_t OatHeader::kOatVersion[] = { '0', '3', '0', '\0' };
+const uint8_t OatHeader::kOatVersion[] = { '0', '3', '1', '\0' };
OatHeader::OatHeader() {
memset(this, 0, sizeof(*this));
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index db2a61b..72a868e 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -264,7 +264,7 @@ bool ParsedOptions::Parse(const Runtime::Options& options, bool ignore_unrecogni
#ifdef HAVE_ANDROID_OS
{
char buf[PROP_VALUE_MAX];
- property_get("dalvik.vm.implicit_checks", buf, "none");
+ property_get("dalvik.vm.implicit_checks", buf, "null,stack");
std::string checks(buf);
std::vector<std::string> checkvec;
Split(checks, ',', checkvec);