[gcc(refs/users/pheeck/heads/sccp)] analyzer: fix nondeterminism in logs

[gcc(refs/users/pheeck/heads/sccp)] analyzer: fix nondeterminism in logs

[Filip Kastl]

https://gcc.gnu.org/g:4992b1ef55bce51435c6badc9583169a20cdf49f

commit 4992b1ef55bce51435c6badc9583169a20cdf49f
Author: David Malcolm <dmalcolm@redhat.com>
Date:   Wed Nov 23 20:43:32 2022 -0500

    analyzer: fix nondeterminism in logs
    
    gcc/analyzer/ChangeLog:
            * checker-path.cc (checker_path::inject_any_inlined_call_events):
            Don't dump the address of the block when -fdump-noaddr.
    
    Signed-off-by: David Malcolm <dmalcolm@redhat.com>

Diff:
---
 gcc/analyzer/checker-path.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gcc/analyzer/checker-path.cc b/gcc/analyzer/checker-path.cc
index cbe24a2058a..221042ee010 100644
--- a/gcc/analyzer/checker-path.cc
+++ b/gcc/analyzer/checker-path.cc
@@ -273,8 +273,10 @@ checker_path::inject_any_inlined_call_events (logger *logger)
 	       !iter.done_p (); iter.next ())
 	    {
 	      logger->start_log_line ();
-	      logger->log_partial ("  %qE (%p), fndecl: %qE, callsite: 0x%x",
-				   iter.get_block (), iter.get_block (),
+	      logger->log_partial ("  %qE", iter.get_block ());
+	      if (!flag_dump_noaddr)
+		logger->log_partial (" (%p)", iter.get_block ());
+	      logger->log_partial (", fndecl: %qE, callsite: 0x%x",
 				   iter.get_fndecl (), iter.get_callsite ());
 	      if (iter.get_callsite ())
 		dump_location (logger->get_printer (), iter.get_callsite ());