summaryrefslogtreecommitdiffstats
path: root/runtime/oat.cc
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2014-05-08 15:27:31 -0700
committerMathieu Chartier <mathieuc@google.com>2014-05-08 16:59:29 -0700
commit2d1ab0a7bf7639d1af0c453415f9625110c34f6d (patch)
tree765ff7d49c4a9016bfbdf92a43f2aed2c0d0f4d3 /runtime/oat.cc
parent4884ba0c06fbd167a29a057787f4f35160d2ebd1 (diff)
downloadart-2d1ab0a7bf7639d1af0c453415f9625110c34f6d.tar.gz
art-2d1ab0a7bf7639d1af0c453415f9625110c34f6d.tar.bz2
art-2d1ab0a7bf7639d1af0c453415f9625110c34f6d.zip
Use WaitHoldingLocks in ReferenceProcessor::GetReferent.
The caller may be holding other locks, so we must use this or else we get bad mutexes held errors. Also added a lock level for the reference processor. Change-Id: I364a303a4106982bd9bfaac5b116cea1638ea6d3
Diffstat (limited to 'runtime/oat.cc')
-rw-r--r--runtime/oat.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/oat.cc b/runtime/oat.cc
index 4b4b3d0031..c7a821af1f 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', '2', '3', '\0' };
+const uint8_t OatHeader::kOatVersion[] = { '0', '2', '4', '\0' };
OatHeader::OatHeader() {
memset(this, 0, sizeof(*this));