Remove dump_prefix_expression

Since the expression rewrite, dump_prefix_expression has been
misnamed.  This patch cleans this up by removing the function, turning
it into a method on struct expression.

diff --git a/gdb/expprint.c b/gdb/expprint.c
index 8534d2ac443a6aca134df47cab0c4a7898aea79d..914177a122e29750447f8f3f487b313bc63e6e75 100644 (file)
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -59,12 +59,6 @@ op_name (enum exp_opcode opcode)
     }
 }
 
-void
-dump_prefix_expression (struct expression *exp, struct ui_file *stream)
-{
-  exp->op->dump (stream, 0);
-}
-
 /* Meant to be used in debug sessions, so don't export it in a header file.  */
 extern void ATTRIBUTE_USED debug_exp (struct expression *exp);
 

diff --git a/gdb/expression.h b/gdb/expression.h
index 3ba68a2db93eaec6a4014551acf508a6a628acab..a56b1856cda30683dbe38a0570569435285ba426 100644 (file)
--- a/gdb/expression.h
+++ b/gdb/expression.h
@@ -208,6 +208,12 @@ struct expression
     return op->opcode ();
   }
 
+  /* Dump the expression to STREAM.  */
+  void dump (struct ui_file *stream)
+  {
+    op->dump (stream, 0);
+  }
+
   /* Evaluate the expression.  EXPECT_TYPE is the context type of the
      expression; normally this should be nullptr.  NOSIDE controls how
      evaluation is performed.  */
@@ -277,8 +283,6 @@ extern struct value *evaluate_subexp_do_call (expression *exp,
 
 extern const char *op_name (enum exp_opcode opcode);
 
-extern void dump_prefix_expression (struct expression *, struct ui_file *);
-
 /* In an OP_RANGE expression, either bound could be empty, indicating
    that its value is by default that of the corresponding bound of the
    array or string.  Also, the upper end of the range can be exclusive

diff --git a/gdb/parse.c b/gdb/parse.c
index aa12f6fe012d04f5171871e9fe3911f1fe16066e..bfd9de09a10dd633d12c1365188cb364b7da8322 100644 (file)
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -527,7 +527,7 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
   result->op->set_outermost ();
 
   if (expressiondebug)
-    dump_prefix_expression (result.get (), gdb_stdlog);
+    result->dump (gdb_stdlog);
 
   if (completer != nullptr)
     *completer = std::move (ps.m_completion_state);

diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index 7e3d26bc849525031eed7c5105c70a1b5e7f48f4..6f91d87846acc0da5286b0464400478cb21f8051 100644 (file)
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -1328,7 +1328,7 @@ stap_probe::parse_arguments (struct gdbarch *gdbarch)
       expression_up expr = stap_parse_argument (&cur, atype, gdbarch);
 
       if (stap_expression_debug)
-       dump_prefix_expression (expr.get (), gdb_stdlog);
+       expr->dump (gdb_stdlog);
 
       m_parsed_args.emplace_back (bitness, atype, std::move (expr));