diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-08-21 15:59:43 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-08-21 16:00:27 -0700 |
| commit | 67ef46adfb2c4990832e23aebeb9c0582d8519c4 (patch) | |
| tree | 07f95a8a9c022c547842d43fedd155cbaff4df33 /runtime/dex_file.cc | |
| parent | ed9fe4ffd9516cfb01b53a3a2c81d3e223ee352c (diff) | |
| download | art-67ef46adfb2c4990832e23aebeb9c0582d8519c4.zip art-67ef46adfb2c4990832e23aebeb9c0582d8519c4.tar.gz art-67ef46adfb2c4990832e23aebeb9c0582d8519c4.tar.bz2 | |
Avoid handle-less fields in ClassLinker::InitializeClass()
There were some handle-less fields in a SafeMap across GC points.
Bug: 12687968
Change-Id: Ib8c6527d4e23031f1d0074fa11d8f85499b68340
Diffstat (limited to 'runtime/dex_file.cc')
| -rw-r--r-- | runtime/dex_file.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc index ddc2147..db1a044 100644 --- a/runtime/dex_file.cc +++ b/runtime/dex_file.cc @@ -1200,7 +1200,7 @@ void EncodedStaticFieldValueIterator::Next() { } template<bool kTransactionActive> -void EncodedStaticFieldValueIterator::ReadValueToField(mirror::ArtField* field) const { +void EncodedStaticFieldValueIterator::ReadValueToField(Handle<mirror::ArtField> field) const { switch (type_) { case kBoolean: field->SetBoolean<kTransactionActive>(field->GetDeclaringClass(), jval_.z); break; case kByte: field->SetByte<kTransactionActive>(field->GetDeclaringClass(), jval_.b); break; @@ -1227,8 +1227,8 @@ void EncodedStaticFieldValueIterator::ReadValueToField(mirror::ArtField* field) default: UNIMPLEMENTED(FATAL) << ": type " << type_; } } -template void EncodedStaticFieldValueIterator::ReadValueToField<true>(mirror::ArtField* field) const; -template void EncodedStaticFieldValueIterator::ReadValueToField<false>(mirror::ArtField* field) const; +template void EncodedStaticFieldValueIterator::ReadValueToField<true>(Handle<mirror::ArtField> field) const; +template void EncodedStaticFieldValueIterator::ReadValueToField<false>(Handle<mirror::ArtField> field) const; CatchHandlerIterator::CatchHandlerIterator(const DexFile::CodeItem& code_item, uint32_t address) { handler_.address_ = -1; |