git: 84f5770003c4 - stable/13 - ASAN: reduce verbosity

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Mon, 30 May 2022 18:30:29 UTC
The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=84f5770003c4a8e62790eb0348f7e6d6bdb648a4

commit 84f5770003c4a8e62790eb0348f7e6d6bdb648a4
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-04-25 09:23:23 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-05-30 18:27:47 +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
    
    (cherry picked from commit 0a736f0a6aeb0bf8b7e677fab8b562704eb4980e)
---
 .../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 193a7fa8b1c5..12e42cf986ab 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
@@ -2204,9 +2204,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();