Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit 1170865

Browse files
committed
[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
1 parent 9ae2ca6 commit 1170865

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

include/sanitizer/common_interface_defs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ extern "C" {
4848
void __sanitizer_unaligned_store64(void *p, uint64_t x);
4949

5050
// Record and dump coverage info.
51-
void __sanitizer_cov(void *pc);
5251
void __sanitizer_cov_dump();
5352

5453
#ifdef __cplusplus

lib/sanitizer_common/sanitizer_coverage.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ void CovDump() {
106106
} // namespace __sanitizer
107107

108108
extern "C" {
109-
SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov(uptr pc) { CovAdd(pc); }
109+
SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov(void *pc) {
110+
CovAdd(reinterpret_cast<uptr>(pc));
111+
}
110112
SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov_dump() { CovDump(); }
111113
} // extern "C"

lib/sanitizer_common/sanitizer_internal_defs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ extern "C" {
111111
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE
112112
void __sanitizer_report_error_summary(const char *error_summary);
113113

114-
SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov(__sanitizer::uptr pc);
115114
SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov_dump();
115+
SANITIZER_INTERFACE_ATTRIBUTE void __sanitizer_cov(void *pc);
116116
} // extern "C"
117117

118118

0 commit comments

Comments
 (0)