diff options
author | 2016-04-04 13:35:53 +0000 | |
---|---|---|
committer | 2016-04-04 13:35:53 +0000 | |
commit | 2f92ec8a52faa4bc566af8fa34212f3e749e82c8 (patch) | |
tree | 78b9ee38ae016f1198bc21ae7d913bc961f7624a /runtime/entrypoints/entrypoint_utils.cc | |
parent | 75ee5c28ab583c532066b64d6337a5f78d6aa2ad (diff) | |
parent | 61b28a17d9b6e8e998103646e98e4a9772e11927 (diff) |
Merge "Use bit-level packing for InlineInfo in stackmaps as well."
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
-rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index 336841145b..e46576e884 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -280,7 +280,10 @@ ArtMethod* GetCalleeSaveMethodCaller(ArtMethod** sp, DCHECK(stack_map.IsValid()); if (stack_map.HasInlineInfo(encoding.stack_map_encoding)) { InlineInfo inline_info = code_info.GetInlineInfoOf(stack_map, encoding); - caller = GetResolvedMethod(outer_method, inline_info, inline_info.GetDepth() - 1); + caller = GetResolvedMethod(outer_method, + inline_info, + encoding.inline_info_encoding, + inline_info.GetDepth(encoding.inline_info_encoding) - 1); } } } |