analyzer: eliminate non-determinism in logs

[gcc.git] / gcc / analyzer / analyzer-logging.cc

diff --git a/gcc/analyzer/analyzer-logging.cc b/gcc/analyzer/analyzer-logging.cc
index 9a6b36eee3a2287fbd81c1bd6da9074ab099566a..583840ab25a062a4384b35d81eba75fdf743645e 100644 (file)
--- a/gcc/analyzer/analyzer-logging.cc
+++ b/gcc/analyzer/analyzer-logging.cc
@@ -30,6 +30,12 @@ along with GCC; see the file COPYING3.  If not see
 
 #if ENABLE_ANALYZER
 
+#if __GNUC__ >= 10
+#pragma GCC diagnostic ignored "-Wformat-diag"
+#endif
+
+namespace ana {
+
 /* Implementation of class logger.  */
 
 /* ctor for logger.  */
@@ -162,7 +168,7 @@ void
 logger::enter_scope (const char *scope_name)
 {
   log ("entering: %s", scope_name);
-  m_indent_level += 1;
+  inc_indent ();
 }
 
 void
@@ -173,7 +179,7 @@ logger::enter_scope (const char *scope_name, const char *fmt, va_list *ap)
   log_va_partial (fmt, ap);
   end_log_line ();
 
-  m_indent_level += 1;
+  inc_indent ();
 }
 
 
@@ -184,7 +190,7 @@ void
 logger::exit_scope (const char *scope_name)
 {
   if (m_indent_level)
-    m_indent_level -= 1;
+    dec_indent ();
   else
     log ("(mismatching indentation)");
   log ("exiting: %s", scope_name);
@@ -221,4 +227,6 @@ log_user::set_logger (logger *logger)
   m_logger = logger;
 }
 
+} // namespace ana
+
 #endif /* #if ENABLE_ANALYZER */