X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fstap-probe.h;h=e8f24564af9a37792e69c003362787a19fba2a27;hb=081e778cb855581fe63a9b26aa582900da5d1a8b;hp=6d3c12e8267873425457a79b2662f8964468aaf6;hpb=410a0ff2df3fa8d260c1c6d76172c65285968cea;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/stap-probe.h b/gdb/stap-probe.h
index 6d3c12e826..e8f24564af 100644
--- a/gdb/stap-probe.h
+++ b/gdb/stap-probe.h
@@ -1,6 +1,6 @@
 /* SystemTap probe support for GDB.
 
-   Copyright (C) 2012-2014 Free Software Foundation, Inc.
+   Copyright (C) 2012-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,7 +20,6 @@
 #if !defined (STAP_PROBE_H)
 #define STAP_PROBE_H 1
 
-/* For `struct parser_state'.  */
 #include "parser-defs.h"
 
 /* Structure which holds information about the parsing process of one probe's
@@ -28,11 +27,25 @@
 
 struct stap_parse_info
 {
+  stap_parse_info (const char *arg_, struct type *arg_type_,
+		   const struct language_defn *lang,
+		   struct gdbarch *gdbarch)
+    : arg (arg_),
+      pstate (lang, gdbarch),
+      saved_arg (arg_),
+      arg_type (arg_type_),
+      gdbarch (gdbarch),
+      inside_paren_p (0)
+  {
+  }
+
+  DISABLE_COPY_AND_ASSIGN (stap_parse_info);
+
   /* The probe's argument in a string format.  */
   const char *arg;
 
   /* The parser state to be used when generating the expression.  */
-  struct parser_state pstate;
+  struct expr_builder pstate;
 
   /* A pointer to the full chain of arguments.  This is useful for printing
      error messages.  The parser functions should not modify this argument