analyzer: tweak dumping of min_expr/max_expr

gcc/analyzer/ChangeLog:
	* svalue.cc (infix_p): New.
	(binop_svalue::dump_to_pp): Use it to print MIN_EXPR and MAX_EXPR
	in prefix form, rather than infix.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

diff --git a/gcc/analyzer/svalue.cc b/gcc/analyzer/svalue.cc
index 094c725..a1e6f50 100644 (file)
--- a/gcc/analyzer/svalue.cc
+++ b/gcc/analyzer/svalue.cc
@@ -1053,6 +1053,21 @@ unaryop_svalue::maybe_fold_bits_within (tree type,
 
 /* class binop_svalue : public svalue.  */
 
+/* Return whether OP be printed as an infix operator.  */
+
+static bool
+infix_p (enum tree_code op)
+{
+  switch (op)
+    {
+    default:
+      return true;
+    case MAX_EXPR:
+    case MIN_EXPR:
+      return false;
+    }
+}
+
 /* Implementation of svalue::dump_to_pp vfunc for binop_svalue.  */
 
 void
@@ -1060,11 +1075,25 @@ binop_svalue::dump_to_pp (pretty_printer *pp, bool simple) const
 {
   if (simple)
     {
-      pp_character (pp, '(');
-      m_arg0->dump_to_pp (pp, simple);
-      pp_string (pp, op_symbol_code (m_op));
-      m_arg1->dump_to_pp (pp, simple);
-      pp_character (pp, ')');
+      if (infix_p (m_op))
+       {
+         /* Print "(A OP B)".  */
+         pp_character (pp, '(');
+         m_arg0->dump_to_pp (pp, simple);
+         pp_string (pp, op_symbol_code (m_op));
+         m_arg1->dump_to_pp (pp, simple);
+         pp_character (pp, ')');
+       }
+      else
+       {
+         /* Print "OP(A, B)".  */
+         pp_string (pp, op_symbol_code (m_op));
+         pp_character (pp, '(');
+         m_arg0->dump_to_pp (pp, simple);
+         pp_string (pp, ", ");
+         m_arg1->dump_to_pp (pp, simple);
+         pp_character (pp, ')');
+       }
     }
   else
     {