@@ -352,7 +352,7 @@ void __sanitizer::BufferedStackTrace::UnwindImpl(
352
352
353
353
using namespace __msan ;
354
354
355
- static inline void PrintFaultingInstruction (char *instname) {
355
+ static inline void PrintFaultingInstructionIfRequested (char *instname) {
356
356
if (__msan::flags ()->print_faulting_instruction ) {
357
357
Printf (" Instruction that failed the shadow check: %s\n " , instname);
358
358
Printf (" \n " );
@@ -373,7 +373,7 @@ static inline void WarnIfPrintFaultingInstructionRequested() {
373
373
GET_CALLER_PC_BP; \
374
374
if (UNLIKELY (s)) { \
375
375
if (instname) \
376
- PrintFaultingInstruction (instname); \
376
+ PrintFaultingInstructionIfRequested (instname); \
377
377
PrintWarningWithOrigin (pc, bp, o); \
378
378
if (__msan::flags ()->halt_on_error ) { \
379
379
Printf (" Exiting\n " ); \
@@ -446,7 +446,7 @@ void __msan_warning() {
446
446
}
447
447
448
448
void __msan_warning_instname (char *instname) {
449
- PrintFaultingInstruction (instname);
449
+ PrintFaultingInstructionIfRequested (instname);
450
450
__MSAN_WARNING_BODY
451
451
}
452
452
@@ -464,7 +464,7 @@ void __msan_warning_noreturn() {
464
464
}
465
465
466
466
void __msan_warning_noreturn_instname (char *instname) {
467
- PrintFaultingInstruction (instname);
467
+ PrintFaultingInstructionIfRequested (instname);
468
468
__MSAN_WARNING_NORETURN_BODY
469
469
}
470
470
@@ -484,7 +484,7 @@ void __msan_warning_with_origin(u32 origin) {
484
484
}
485
485
486
486
void __msan_warning_with_origin_instname (u32 origin, char *instname) {
487
- PrintFaultingInstruction (instname);
487
+ PrintFaultingInstructionIfRequested (instname);
488
488
__MSAN_WARNING_WITH_ORIGIN_BODY (origin)
489
489
}
490
490
@@ -502,7 +502,7 @@ void __msan_warning_with_origin_noreturn(u32 origin) {
502
502
}
503
503
504
504
void __msan_warning_with_origin_noreturn_instname (u32 origin, char *instname) {
505
- PrintFaultingInstruction (instname);
505
+ PrintFaultingInstructionIfRequested (instname);
506
506
__MSAN_WARNING_WITH_ORIGIN_NORETURN_BODY (origin)
507
507
}
508
508
0 commit comments