diff options
| author | 2018-07-20 13:06:30 +0000 | |
|---|---|---|
| committer | 2018-07-20 13:06:30 +0000 | |
| commit | b07dcdba37e9a5652b7754a6bd9c3538880d6668 (patch) | |
| tree | 15524fb0505323ec78bf4d8841245da6fe61d6ee /compiler/optimizing/stack_map_stream.cc | |
| parent | 6250dfa22577160b270f3f3165260739707cf7d3 (diff) | |
| parent | c945e0d410ca8d4e9ba09272e8727a3192f1e449 (diff) | |
Merge changes I87f2999f,I8af0e845
* changes:
Remove ArtMethod's declaring class state checks.
ObjPtr<>-ify ArtMethod and mirror::Method.
Diffstat (limited to 'compiler/optimizing/stack_map_stream.cc')
| -rw-r--r-- | compiler/optimizing/stack_map_stream.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index a65fbcc514..d74d7b695c 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -179,7 +179,7 @@ void StackMapStream::BeginInlineInfoEntry(ArtMethod* method, ScopedObjectAccess soa(Thread::Current()); DCHECK(IsSameDexFile(*outer_dex_file, *method->GetDexFile())); } - uint32_t dex_method_index = method->GetDexMethodIndexUnchecked(); + uint32_t dex_method_index = method->GetDexMethodIndex(); entry[InlineInfo::kMethodInfoIndex] = method_infos_.Dedup({dex_method_index}); } current_inline_infos_.push_back(entry); @@ -196,8 +196,7 @@ void StackMapStream::BeginInlineInfoEntry(ArtMethod* method, if (encode_art_method) { CHECK_EQ(inline_info.GetArtMethod(), method); } else { - CHECK_EQ(method_infos_[inline_info.GetMethodInfoIndex()][0], - method->GetDexMethodIndexUnchecked()); + CHECK_EQ(method_infos_[inline_info.GetMethodInfoIndex()][0], method->GetDexMethodIndex()); } }); } |