dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm] Fix offset that was breaking bare_instructions_trampolines_test

Browse Source 
This was the last remaining test that differed between simarm and
simarm_x64. All tests now produce the same results.

Bug: https://github.com/dart-lang/sdk/issues/36839
Change-Id: I98fef568c5eeee1391aa0e6299fb21890eebb396
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107827
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Liam Appelbe <liama@google.com>
This commit is contained in:
Liam Appelbe
2019-07-01 21:54:39 +00:00
committed by commit-bot@chromium.org
parent 1db0b4436c
commit bbb027aa2a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/vm/compiler/relocation.cc
+5 -3
View File
@@ -275,8 +275,9 @@ void CodeRelocator::ScanCallTargets(const Code& code,
offset_into_target += (entry_point - destination_payload);
const intptr_t text_offset =
code_text_offset + Instructions::HeaderSize() + offset;
const intptr_t text_offset = code_text_offset +
compiler::target::Instructions::HeaderSize() +
offset;
UnresolvedCall unresolved_call(code.raw(), offset, text_offset,
destination_.raw(), offset_into_target);
if (!TryResolveBackwardsCall(&unresolved_call)) {
@@ -502,7 +503,8 @@ intptr_t CodeRelocator::FindDestinationInText(
const RawInstructions* destination,
intptr_t offset_into_target) {
auto destination_offset = text_offsets_.LookupValue(destination);
return destination_offset + Instructions::HeaderSize() + offset_into_target;
return destination_offset + compiler::target::Instructions::HeaderSize() +
offset_into_target;
}
#endif // defined(DART_PRECOMPILER) && !defined(TARGET_ARCH_DBC) && \