git: 0a736f0a6aeb - main - ASAN: reduce verbosity

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Mon, 25 Apr 2022 13:42:16 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=0a736f0a6aeb0bf8b7e677fab8b562704eb4980e

commit 0a736f0a6aeb0bf8b7e677fab8b562704eb4980e
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-04-25 09:23:23 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2022-04-25 13:41:32 +0000

    ASAN: reduce verbosity
    
    When running binaries compiled with libasan in PIE and with ALSR on,
    the previous code always print the WARNING message, the new code only
    printed it if the run is made with the right verbosity
    
    Before this change, many unit test will always fail because of the extra
    message which is printed
    
    Reviewed by:    emaste
    Differential Revision:  https://reviews.freebsd.org/D35055
    MFC after:      2 weeks
---
 .../compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
index 769e8029dfcb..d2dcba6d654a 100644
--- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
@@ -2208,9 +2208,9 @@ void CheckASLR() {
     return;
   }
   if ((aslr_status & PROC_ASLR_ACTIVE) != 0) {
-    Printf("This sanitizer is not compatible with enabled ASLR "
-           "and binaries compiled with PIE\n"
-           "ASLR will be disabled and the program re-executed.\n");
+    VReport(1, "This sanitizer is not compatible with enabled ASLR "
+               "and binaries compiled with PIE\n"
+               "ASLR will be disabled and the program re-executed.\n");
     int aslr_ctl = PROC_ASLR_FORCE_DISABLE;
     CHECK_NE(procctl(P_PID, 0, PROC_ASLR_CTL, &aslr_ctl), -1);
     ReExec();