diff options
| author | 2016-04-01 12:28:51 +0000 | |
|---|---|---|
| committer | 2016-04-01 12:28:51 +0000 | |
| commit | fe2b13717879abae993603534a145372e3110aae (patch) | |
| tree | 5b499eb28af5e91e00ff86683f51df029a2b86b4 /runtime/stack.cc | |
| parent | 5c26e430fbeaf56e3a5da4e3f167ff35fbb71ef9 (diff) | |
| parent | 09ed09866da6d8c7448ef297c148bfa577a247c2 (diff) | |
Merge "Pack stack map entries on bit level to save space."
Diffstat (limited to 'runtime/stack.cc')
| -rw-r--r-- | runtime/stack.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index 57ce07d34a..23363654d2 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -117,7 +117,7 @@ InlineInfo StackVisitor::GetCurrentInlineInfo() const { const OatQuickMethodHeader* method_header = GetCurrentOatQuickMethodHeader(); uint32_t native_pc_offset = method_header->NativeQuickPcOffset(cur_quick_frame_pc_); CodeInfo code_info = method_header->GetOptimizedCodeInfo(); - StackMapEncoding encoding = code_info.ExtractEncoding(); + CodeInfoEncoding encoding = code_info.ExtractEncoding(); StackMap stack_map = code_info.GetStackMapForNativePcOffset(native_pc_offset, encoding); DCHECK(stack_map.IsValid()); return code_info.GetInlineInfoOf(stack_map, encoding); @@ -312,7 +312,7 @@ bool StackVisitor::GetVRegFromOptimizedCode(ArtMethod* m, uint16_t vreg, VRegKin DCHECK_LT(vreg, code_item->registers_size_); const OatQuickMethodHeader* method_header = GetCurrentOatQuickMethodHeader(); CodeInfo code_info = method_header->GetOptimizedCodeInfo(); - StackMapEncoding encoding = code_info.ExtractEncoding(); + CodeInfoEncoding encoding = code_info.ExtractEncoding(); uint32_t native_pc_offset = method_header->NativeQuickPcOffset(cur_quick_frame_pc_); StackMap stack_map = code_info.GetStackMapForNativePcOffset(native_pc_offset, encoding); @@ -868,11 +868,11 @@ void StackVisitor::WalkStack(bool include_transitions) { && (cur_oat_quick_method_header_ != nullptr) && cur_oat_quick_method_header_->IsOptimized()) { CodeInfo code_info = cur_oat_quick_method_header_->GetOptimizedCodeInfo(); - StackMapEncoding encoding = code_info.ExtractEncoding(); + CodeInfoEncoding encoding = code_info.ExtractEncoding(); uint32_t native_pc_offset = cur_oat_quick_method_header_->NativeQuickPcOffset(cur_quick_frame_pc_); StackMap stack_map = code_info.GetStackMapForNativePcOffset(native_pc_offset, encoding); - if (stack_map.IsValid() && stack_map.HasInlineInfo(encoding)) { + if (stack_map.IsValid() && stack_map.HasInlineInfo(encoding.stack_map_encoding)) { InlineInfo inline_info = code_info.GetInlineInfoOf(stack_map, encoding); DCHECK_EQ(current_inlining_depth_, 0u); for (current_inlining_depth_ = inline_info.GetDepth(); |