From: David Malcolm <dmalcolm@redhat.com>
Date: Thu, 24 Nov 2022 01:43:32 +0000 (-0500)
Subject: analyzer: fix nondeterminism in logs
X-Git-Tag: basepoints/gcc-14~2932
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0f18b87bfaf0b60f4fd0aaffefb4ca2869aff52;p=thirdparty%2Fgcc.git

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 --git a/gcc/analyzer/checker-path.cc b/gcc/analyzer/checker-path.cc
index cbe24a2058a2..221042ee010d 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 ());