Skip to content

Commit

Permalink
[dsymutil] Avoid relocating DW_AT_call_pc twice
Browse files Browse the repository at this point in the history
Summary:
Avoid relocating DW_AT_call_pc, e.g. when a call PC is equal to the
function's low_pc as is the case in the test:

```
__Z5func1v:
0000000100007f94        b       __Z5func2v
```

rdar://62952440

Reviewers: friss, JDevlieghere

Subscribers: hiraditya, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D79536
  • Loading branch information
vedantk committed May 7, 2020
1 parent 59b3102 commit 9f88912
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 0 deletions.
2 changes: 2 additions & 0 deletions llvm/lib/DWARFLinker/DWARFLinker.cpp
Expand Up @@ -1344,6 +1344,8 @@ DIE *DWARFLinker::DIECloner::cloneDIE(const DWARFDie &InputDIE,
std::numeric_limits<uint64_t>::max());
AttrInfo.OrigCallReturnPc =
dwarf::toAddress(InputDIE.find(dwarf::DW_AT_call_return_pc), 0);
AttrInfo.OrigCallPc =
dwarf::toAddress(InputDIE.find(dwarf::DW_AT_call_pc), 0);
}

// Reset the Offset to 0 as we will be working on the local copy of
Expand Down
20 changes: 20 additions & 0 deletions llvm/test/tools/dsymutil/ARM/call-pc-reloc.test
@@ -0,0 +1,20 @@
Instructions to reproduce
-------------------------

$ cat main.cpp
void __attribute__((optnone)) func2() {}
void __attribute__((noinline)) func1() { func2(); /* tail */ }
int __attribute__((disable_tail_calls)) main() {
func1(); /* regular */
return 0;
}

# Adding `-isysroot $(xcrun -sdk iphoneos.internal -show-sdk-path)` can fix
# linker warnings when building on macOS.
$ clang -arch arm64 main.cpp -o main.arm64.o -c -g -O2
$ clang -arch arm64 main.arm64.o -o main.arm64 -g

RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/call_pc/main.arm64 -o %t.dSYM
RUN: llvm-dwarfdump %t.dSYM | FileCheck %s -implicit-check-not=DW_AT_call_pc

CHECK: DW_AT_call_pc (0x0000000100007f94)
Binary file not shown.
Binary file not shown.

0 comments on commit 9f88912

Please sign in to comment.