diff options
| author | Ian Rogers <irogers@google.com> | 2014-08-15 11:09:28 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-08-15 11:35:38 -0700 |
| commit | 43c69cc4cea794cd4d89d9d0680b1e25c6d02acc (patch) | |
| tree | fdfabd74408bc13e4b73674e881ab0ebbfb39d0f /runtime/mirror | |
| parent | 37f048b19da5ac245a6b2a8473b326d2167cc692 (diff) | |
| download | art-43c69cc4cea794cd4d89d9d0680b1e25c6d02acc.tar.gz art-43c69cc4cea794cd4d89d9d0680b1e25c6d02acc.tar.bz2 art-43c69cc4cea794cd4d89d9d0680b1e25c6d02acc.zip | |
Make Monitor::Wait more robust to spurious Inflate failures.
Bug: 17062710
Change-Id: Ife5f6b335caacc70cab543cd568676d277d3beb6
(cherry picked from commit 6f22fc166ed6c11cad229bff442c064e704de101)
Diffstat (limited to 'runtime/mirror')
| -rw-r--r-- | runtime/mirror/object.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/mirror/object.cc b/runtime/mirror/object.cc index 3543654868..a1177d645d 100644 --- a/runtime/mirror/object.cc +++ b/runtime/mirror/object.cc @@ -162,7 +162,8 @@ int32_t Object::IdentityHashCode() const { break; } case LockWord::kThinLocked: { - // Inflate the thin lock to a monitor and stick the hash code inside of the monitor. + // Inflate the thin lock to a monitor and stick the hash code inside of the monitor. May + // fail spuriously. Thread* self = Thread::Current(); StackHandleScope<1> hs(self); Handle<mirror::Object> h_this(hs.NewHandle(current_this)); |