Skip to content

Commit f3cdb83

Browse files
committed
PrintFaultingInstruction -> PrintFaultingInstructionIfRequested
1 parent 56791cf commit f3cdb83

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

compiler-rt/lib/msan/msan.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ void __sanitizer::BufferedStackTrace::UnwindImpl(
352352

353353
using namespace __msan;
354354

355-
static inline void PrintFaultingInstruction(char *instname) {
355+
static inline void PrintFaultingInstructionIfRequested(char *instname) {
356356
if (__msan::flags()->print_faulting_instruction) {
357357
Printf("Instruction that failed the shadow check: %s\n", instname);
358358
Printf("\n");
@@ -373,7 +373,7 @@ static inline void WarnIfPrintFaultingInstructionRequested() {
373373
GET_CALLER_PC_BP; \
374374
if (UNLIKELY(s)) { \
375375
if (instname) \
376-
PrintFaultingInstruction(instname); \
376+
PrintFaultingInstructionIfRequested(instname); \
377377
PrintWarningWithOrigin(pc, bp, o); \
378378
if (__msan::flags()->halt_on_error) { \
379379
Printf("Exiting\n"); \
@@ -446,7 +446,7 @@ void __msan_warning() {
446446
}
447447

448448
void __msan_warning_instname(char *instname) {
449-
PrintFaultingInstruction(instname);
449+
PrintFaultingInstructionIfRequested(instname);
450450
__MSAN_WARNING_BODY
451451
}
452452

@@ -464,7 +464,7 @@ void __msan_warning_noreturn() {
464464
}
465465

466466
void __msan_warning_noreturn_instname(char *instname) {
467-
PrintFaultingInstruction(instname);
467+
PrintFaultingInstructionIfRequested(instname);
468468
__MSAN_WARNING_NORETURN_BODY
469469
}
470470

@@ -484,7 +484,7 @@ void __msan_warning_with_origin(u32 origin) {
484484
}
485485

486486
void __msan_warning_with_origin_instname(u32 origin, char *instname) {
487-
PrintFaultingInstruction(instname);
487+
PrintFaultingInstructionIfRequested(instname);
488488
__MSAN_WARNING_WITH_ORIGIN_BODY(origin)
489489
}
490490

@@ -502,7 +502,7 @@ void __msan_warning_with_origin_noreturn(u32 origin) {
502502
}
503503

504504
void __msan_warning_with_origin_noreturn_instname(u32 origin, char *instname) {
505-
PrintFaultingInstruction(instname);
505+
PrintFaultingInstructionIfRequested(instname);
506506
__MSAN_WARNING_WITH_ORIGIN_NORETURN_BODY(origin)
507507
}
508508

0 commit comments

Comments
 (0)