diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-10 14:23:35 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-13 16:15:22 -0700 |
| commit | d3ed9a320a89cb9b91b2361892c043ab7e112717 (patch) | |
| tree | 94d2b646e8ff9b28e0bef735804ce17a6a8be729 /runtime/handle.h | |
| parent | 4b5673b7387804947a1605a906deee132ab28f14 (diff) | |
| download | art-d3ed9a320a89cb9b91b2361892c043ab7e112717.tar.gz art-d3ed9a320a89cb9b91b2361892c043ab7e112717.tar.bz2 art-d3ed9a320a89cb9b91b2361892c043ab7e112717.zip | |
Fix DCHECK failures from Class::VisitFieldRoots
We now use GetDeclaringClassUnchecked when marking roots to fix
flaky test failures. Fixed a race condition in root marking where
we could have non zero field array length with a null pointer.
Fixed a race condition where we could be marking roots before
FixupTemporaryDeclaringClass had finished. The solution is to
only do the declaring class CHECK if we are at least resolved.
Fixed JDWP tests by changing FieldId / MethodId to be 64 bits.
Also some cleanup.
Change-Id: Ibac09519860d93c3f68a5cc964bbc91dc10a279a
Diffstat (limited to 'runtime/handle.h')
| -rw-r--r-- | runtime/handle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/handle.h b/runtime/handle.h index 3ebb2d5d30..d94d87552a 100644 --- a/runtime/handle.h +++ b/runtime/handle.h @@ -70,8 +70,8 @@ class Handle : public ValueObject { return reinterpret_cast<jobject>(reference_); } - StackReference<mirror::Object>* GetReference() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) - ALWAYS_INLINE { + ALWAYS_INLINE StackReference<mirror::Object>* GetReference() + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return reference_; } |