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 cbe24a2058a235536ae3c124f15a0e5f098a0ecc..221042ee010db3f9251ec747d7272c7b92c138c4 100644 (file)
--- 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 ());