ubsan: alpha-vma: timeout

[deliverable/binutils-gdb.git] / gdb / location.c

diff --git a/gdb/location.c b/gdb/location.c
index 6752462bcf190fb4b801e85f08060352ce603b54..faa37525619c3830ea8641ccffc9be79c0ff0a8b 100644 (file)
--- a/gdb/location.c
+++ b/gdb/location.c
@@ -1,5 +1,5 @@
 /* Data structures and API for event locations in GDB.
-   Copyright (C) 2013-2017 Free Software Foundation, Inc.
+   Copyright (C) 2013-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
+#include "gdbsupport/gdb_assert.h"
 #include "location.h"
 #include "symtab.h"
 #include "language.h"
@@ -843,7 +843,7 @@ string_to_explicit_location (const char **argp,
             Stop parsing and return whatever explicit location was
             parsed.  */
          *argp = start;
-         return location;
+         break;
        }
 
       *argp = skip_spaces (*argp);
@@ -915,10 +915,10 @@ string_to_event_location_basic (const char **stringp,
 
 event_location_up
 string_to_event_location (const char **stringp,
-                         const struct language_defn *language)
+                         const struct language_defn *language,
+                         symbol_name_match_type match_type)
 {
   const char *arg, *orig;
-  symbol_name_match_type match_type = symbol_name_match_type::WILD;
 
   /* Try an explicit location.  */
   orig = arg = *stringp;