[AArch64] PR target/20666, fix wrong encoding of new introduced BFC pseudo

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

diff --git a/gdb/linespec.c b/gdb/linespec.c
index c0c3b3b39c33614f5659538d8c50207fd1a340c6..ab59544ab35295584f4a7555e19d8a52a32c07ad 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -845,6 +845,8 @@ add_sal_to_sals (struct linespec_state *self,
       canonical = &self->canonical_names[sals->nelts - 1];
       if (!literal_canonical && sal->symtab)
        {
+         symtab_to_fullname (sal->symtab);
+
          /* Note that the filter doesn't have to be a valid linespec
             input.  We only apply the ":LINE" treatment to Ada for
             the time being.  */
@@ -1517,10 +1519,9 @@ unexpected_linespec_error (linespec_parser *parser)
       || token.type == LSTOKEN_KEYWORD)
     {
       char *string;
-      struct cleanup *cleanup;
 
       string = copy_token_string (token);
-      cleanup = make_cleanup (xfree, string);
+      make_cleanup (xfree, string);
       throw_error (GENERIC_ERROR,
                   _("malformed linespec error: unexpected %s, \"%s\""),
                   token_type_strings[token.type], string);
@@ -3317,12 +3318,6 @@ find_linespec_symbols (struct linespec_state *state,
         name into namespaces${SCOPE_OPERATOR}class_name and method_name.  */
       scope_op = "::";
       p = find_toplevel_string (lookup_name, scope_op);
-      if (p == NULL)
-       {
-         /* No C++ scope operator.  Try Java.  */
-         scope_op = ".";
-         p = find_toplevel_string (lookup_name, scope_op);
-       }
 
       last = NULL;
       while (p != NULL)