diff options
| -rw-r--r-- | runtime/gc/reference_processor.cc | 1 | ||||
| -rw-r--r-- | runtime/verifier/reg_type_cache.h | 20 |
2 files changed, 10 insertions, 11 deletions
diff --git a/runtime/gc/reference_processor.cc b/runtime/gc/reference_processor.cc index 75de623585..bfaa2bb0cc 100644 --- a/runtime/gc/reference_processor.cc +++ b/runtime/gc/reference_processor.cc @@ -132,7 +132,6 @@ void ReferenceProcessor::ProcessReferences(bool concurrent, TimingLogger* timing if (concurrent) { StartPreservingReferences(self); } - soft_reference_queue_.ForwardSoftReferences(&PreserveSoftReferenceCallback, &process_references_args_); process_mark_stack_callback(arg); diff --git a/runtime/verifier/reg_type_cache.h b/runtime/verifier/reg_type_cache.h index 29933cff1f..ff7b1f3bab 100644 --- a/runtime/verifier/reg_type_cache.h +++ b/runtime/verifier/reg_type_cache.h @@ -80,34 +80,34 @@ class RegTypeCache { const BooleanType& Boolean() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *BooleanType::GetInstance(); } - const RegType& Byte() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const ByteType& Byte() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *ByteType::GetInstance(); } - const RegType& Char() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const CharType& Char() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *CharType::GetInstance(); } - const RegType& Short() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const ShortType& Short() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *ShortType::GetInstance(); } - const RegType& Integer() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const IntegerType& Integer() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *IntegerType::GetInstance(); } - const RegType& Float() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const FloatType& Float() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *FloatType::GetInstance(); } - const RegType& LongLo() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const LongLoType& LongLo() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *LongLoType::GetInstance(); } - const RegType& LongHi() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const LongHiType& LongHi() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *LongHiType::GetInstance(); } - const RegType& DoubleLo() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const DoubleLoType& DoubleLo() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *DoubleLoType::GetInstance(); } - const RegType& DoubleHi() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const DoubleHiType& DoubleHi() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *DoubleHiType::GetInstance(); } - const RegType& Undefined() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + const UndefinedType& Undefined() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { return *UndefinedType::GetInstance(); } const ConflictType& Conflict() { |