Skip to content

Commit 34840c1

Browse files
committed
Revert "[sanitizers] Avoid macro clash in SignalContext::WriteFlag (NFC)"
This reverts commit fda2926. This breaks the sanitizer build on windows, will reapply with additional changes.
1 parent c091792 commit 34840c1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

compiler-rt/lib/asan/asan_errors.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ struct ErrorDeadlySignal : ErrorBase {
5353
scariness.Scare(10, "null-deref");
5454
} else if (signal.addr == signal.pc) {
5555
scariness.Scare(60, "wild-jump");
56-
} else if (signal.write_flag == SignalContext::Write) {
56+
} else if (signal.write_flag == SignalContext::WRITE) {
5757
scariness.Scare(30, "wild-addr-write");
58-
} else if (signal.write_flag == SignalContext::Read) {
58+
} else if (signal.write_flag == SignalContext::READ) {
5959
scariness.Scare(20, "wild-addr-read");
6060
} else {
6161
scariness.Scare(25, "wild-addr");

compiler-rt/lib/sanitizer_common/sanitizer_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ struct SignalContext {
959959
uptr sp;
960960
uptr bp;
961961
bool is_memory_access;
962-
enum WriteFlag { Unknown, Read, Write } write_flag;
962+
enum WriteFlag { UNKNOWN, READ, WRITE } write_flag;
963963

964964
// In some cases the kernel cannot provide the true faulting address; `addr`
965965
// will be zero then. This field allows to distinguish between these cases

compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1825,7 +1825,7 @@ SignalContext::WriteFlag SignalContext::GetWriteFlag() const {
18251825
#else
18261826
uptr err = ucontext->uc_mcontext.gregs[REG_ERR];
18271827
#endif // SANITIZER_FREEBSD
1828-
return err & PF_WRITE ? Write : Read;
1828+
return err & PF_WRITE ? WRITE : READ;
18291829
#elif defined(__mips__)
18301830
uint32_t *exception_source;
18311831
uint32_t faulty_instruction;

compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ static void ReportDeadlySignalImpl(const SignalContext &sig, u32 tid,
211211
Report("Hint: pc points to the zero page.\n");
212212
if (sig.is_memory_access) {
213213
const char *access_type =
214-
sig.write_flag == SignalContext::Write
214+
sig.write_flag == SignalContext::WRITE
215215
? "WRITE"
216-
: (sig.write_flag == SignalContext::Read ? "READ" : "UNKNOWN");
216+
: (sig.write_flag == SignalContext::READ ? "READ" : "UNKNOWN");
217217
Report("The signal is caused by a %s memory access.\n", access_type);
218218
if (!sig.is_true_faulting_addr)
219219
Report("Hint: this fault was caused by a dereference of a high value "

0 commit comments

Comments
 (0)