diff options
| -rw-r--r-- | llvm/tools/sancov/sancov.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/llvm/tools/sancov/sancov.cpp b/llvm/tools/sancov/sancov.cpp index 0bddd35a96f..e8935d1be21 100644 --- a/llvm/tools/sancov/sancov.cpp +++ b/llvm/tools/sancov/sancov.cpp @@ -766,6 +766,19 @@ findSanitizerCovFunctions(const object::ObjectFile &O) { return Result; } +static uint64_t getPreviousInstructionPc(uint64_t PC, + Triple TheTriple) { + if (TheTriple.isARM()) { + return (PC - 3) & (~1); + } else if (TheTriple.isAArch64()) { + return PC - 4; + } else if (TheTriple.isMIPS()) { + return PC - 8; + } else { + return PC - 1; + } +} + // Locate addresses of all coverage points in a file. Coverage point // is defined as the 'address of instruction following __sanitizer_cov // call - 1'. @@ -832,7 +845,7 @@ static void getObjectCoveragePoints(const object::ObjectFile &O, } uint64_t Addr = Index + SectionAddr; // Sanitizer coverage uses the address of the next instruction - 1. - uint64_t CovPoint = Addr + Size - 1; + uint64_t CovPoint = getPreviousInstructionPc(Addr + Size, TheTriple); uint64_t Target; if (MIA->isCall(Inst) && MIA->evaluateBranch(Inst, SectionAddr + Index, Size, Target) && |
