diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2016-01-28 19:58:26 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2016-01-28 19:58:26 +0000 |
| commit | dfef2cf502766c4df13dc949d635df115a085f25 (patch) | |
| tree | 813bfbee01c7fd5695dea85e339c679d1a139b9b | |
| parent | 98f9bc645617916a015e8506b3bf0a3261610382 (diff) | |
| download | bcm5719-llvm-dfef2cf502766c4df13dc949d635df115a085f25.tar.gz bcm5719-llvm-dfef2cf502766c4df13dc949d635df115a085f25.zip | |
[cfi] Simplify the code in CfiSlowPathCommon.
llvm-svn: 259085
| -rw-r--r-- | compiler-rt/lib/cfi/cfi.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/compiler-rt/lib/cfi/cfi.cc b/compiler-rt/lib/cfi/cfi.cc index 8a32ab59dc6..524730f8132 100644 --- a/compiler-rt/lib/cfi/cfi.cc +++ b/compiler-rt/lib/cfi/cfi.cc @@ -303,20 +303,15 @@ ALWAYS_INLINE void CfiSlowPathCommon(u64 CallSiteTypeId, void *Ptr, VReport(3, "__cfi_slowpath: %llx, %p\n", CallSiteTypeId, Ptr); ShadowValue sv = ShadowValue::load(Addr); if (sv.is_invalid()) { - // FIXME: call the ubsan handler if DiagData != nullptr? VReport(1, "CFI: invalid memory region for a check target: %p\n", Ptr); #ifdef CFI_ENABLE_DIAG if (DiagData) { __ubsan_handle_cfi_check_fail( - reinterpret_cast<__ubsan::CFICheckFailData *>(DiagData), - reinterpret_cast<uptr>(Ptr)); + reinterpret_cast<__ubsan::CFICheckFailData *>(DiagData), Addr); return; - } else { - Trap(); } -#else - Trap(); #endif + Trap(); } if (sv.is_unchecked()) { VReport(2, "CFI: unchecked call (shadow=FFFF): %p\n", Ptr); |
