diff options
| author | Kostya Serebryany <kcc@google.com> | 2013-11-14 13:44:43 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2013-11-14 13:44:43 +0000 |
| commit | 1170865d797f338b71d8b9d20297f3d9015144be (patch) | |
| tree | 17e1cdafda9df1c3fb039ce69262de87e562668c | |
| parent | 9ae2ca693a89c4f5c7e67788038ea84c328b8b1b (diff) | |
| download | compiler-rt-1170865d797f338b71d8b9d20297f3d9015144be.tar.gz | |
[asan] unbreak dfsan, which includes sanitizer/common_interface_defs.h into internal sources (although it shoudn't)
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@194704 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/sanitizer/common_interface_defs.h | 1 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_coverage.cc | 4 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_internal_defs.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/sanitizer/common_interface_defs.h b/include/sanitizer/common_interface_defs.h index b9c0d7311..70a5c0cd3 100644 --- a/include/sanitizer/common_interface_defs.h +++ b/include/sanitizer/common_interface_defs.h @@ -48,7 +48,6 @@ extern "C" { void __sanitizer_unaligned_store64(void *p, uint64_t x); // Record and dump coverage info. - void __sanitizer_cov(void *pc); void __sanitizer_cov_dump(); #ifdef __cplusplus diff --git a/lib/sanitizer_common/sanitizer_coverage.cc b/lib/sanitizer_common/sanitizer_coverage.cc index 68643b112..9e7a0f8b9 100644 --- a/lib/sanitizer_common/sanitizer_coverage.cc +++ b/lib/sanitizer_common/sanitizer_coverage.cc @@ -106,6 +106,8 @@ void CovDump() { } // namespace __sanitizer extern "C" { -SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov(uptr pc) { CovAdd(pc); } +SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov(void *pc) { + CovAdd(reinterpret_cast<uptr>(pc)); +} SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov_dump() { CovDump(); } } // extern "C" diff --git a/lib/sanitizer_common/sanitizer_internal_defs.h b/lib/sanitizer_common/sanitizer_internal_defs.h index 0f8367ff4..bf0c56851 100644 --- a/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/lib/sanitizer_common/sanitizer_internal_defs.h @@ -111,8 +111,8 @@ extern "C" { SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void __sanitizer_report_error_summary(const char *error_summary); - SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov(__sanitizer::uptr pc); SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov_dump(); + SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov(void *pc); } // extern "C" |