Simplify agent_expr constructor

This simplifies the agent_expr constructor a bit, and removes the
destructor entirely.

Reviewed-by: John Baldwin <jhb@FreeBSD.org>

diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index e2a3c31e7f41ca3a41520989dd12c452cd555077..b28c8e70e0c40f9326c82d63b841882ba5025d27 100644 (file)
--- a/gdb/ax-general.c
+++ b/gdb/ax-general.c
@@ -36,19 +36,6 @@ static void generic_ext (struct agent_expr *x, enum agent_op op, int n);
 \f
 /* Functions for building expressions.  */
 
-agent_expr::agent_expr (struct gdbarch *gdbarch, CORE_ADDR scope)
-{
-  this->gdbarch = gdbarch;
-  this->scope = scope;
-
-  this->tracing = 0;
-  this->trace_string = 0;
-}
-
-agent_expr::~agent_expr ()
-{
-}
-
 /* Append the low N bytes of VAL as an N-byte integer to the
    expression X, in big-endian order.  */
 static void

diff --git a/gdb/ax.h b/gdb/ax.h
index b0eb20daf75c33d1f68e1b03b8022c8d70643c32..67ad3145349cbe6f3840a0fcc043bc3836319dc3 100644 (file)
--- a/gdb/ax.h
+++ b/gdb/ax.h
@@ -81,9 +81,11 @@ enum agent_flaws
 struct agent_expr
   {
     /* Construct an empty agent expression.  */
-    explicit agent_expr (struct gdbarch *gdbarch, CORE_ADDR scope);
-
-    ~agent_expr ();
+    agent_expr (struct gdbarch *gdbarch, CORE_ADDR scope)
+      : gdbarch (gdbarch),
+       scope (scope),
+       tracing (0)
+    { }
 
     /* The bytes of the expression.  */
     gdb::byte_vector buf;
@@ -139,7 +141,7 @@ struct agent_expr
        tracenz bytecode to record nonzero bytes, up to a length that
        is the value of trace_string.  */
 
-    int trace_string;
+    int trace_string = 0;
   };
 
 /* An agent_expr owning pointer.  */