diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2016-01-08 23:42:30 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2016-01-08 23:42:30 +0000 |
| commit | 6742d75952921124f27400a23283cff2bfd0db4a (patch) | |
| tree | 49c636624a28d4089404142f1c6cdeb2d93a4ce2 /compiler-rt/lib/cfi | |
| parent | d85c32cdfa9e769686cf4a57cd8c9c9b14775592 (diff) | |
| download | bcm5719-llvm-6742d75952921124f27400a23283cff2bfd0db4a.tar.gz bcm5719-llvm-6742d75952921124f27400a23283cff2bfd0db4a.zip | |
[cfi] Fix __cfi_slowpath and __cfi_check signature.
The first argument is uint64_t, not uintptr_t.
llvm-svn: 257233
Diffstat (limited to 'compiler-rt/lib/cfi')
| -rw-r--r-- | compiler-rt/lib/cfi/cfi.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/lib/cfi/cfi.cc b/compiler-rt/lib/cfi/cfi.cc index 0e2a0919069..711866f3fa0 100644 --- a/compiler-rt/lib/cfi/cfi.cc +++ b/compiler-rt/lib/cfi/cfi.cc @@ -42,7 +42,7 @@ static uint16_t *mem_to_shadow(uptr x) { return (uint16_t *)(__cfi_shadow + ((x >> kShadowGranularity) << 1)); } -typedef int (*CFICheckFn)(uptr, void *); +typedef int (*CFICheckFn)(u64, void *); class ShadowValue { uptr addr; @@ -189,9 +189,9 @@ static void init_shadow() { } extern "C" SANITIZER_INTERFACE_ATTRIBUTE -void __cfi_slowpath(uptr CallSiteTypeId, void *Ptr) { +void __cfi_slowpath(u64 CallSiteTypeId, void *Ptr) { uptr Addr = (uptr)Ptr; - VReport(3, "__cfi_slowpath: %zx, %p\n", CallSiteTypeId, Ptr); + VReport(3, "__cfi_slowpath: %llx, %p\n", CallSiteTypeId, Ptr); ShadowValue sv = ShadowValue::load(Addr); if (sv.is_invalid()) { VReport(2, "CFI: invalid memory region for a function pointer (shadow==0): %p\n", Ptr); |
