mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
fcfcc37696
In https://github.com/rust-lang/rust/pull/46457, "m4b" pointed out that the Rust support in gdb doesn't properly handle the lookup of qualified names. In particular, as shown in the test case in this patch, something like "::NAME" should be found in the global scope, but is not. This turns out to happen because rust_lookup_symbol_nonlocal does not search the global scope unless the name in question is unqualified. However, lookup_symbol_aux does not search the global scope, and appears to search the static scope only as a fallback (I wonder if this is needed?). This patch fixes the problem by changing rust_lookup_symbol_nonlocal to search the static and global blocks in more cases. Regression tested against various versions of the rust compiler on Fedora 26 x86-64. (Note that there are unrelated failures with newer versions of rustc; I will be addressing those separately.) 2018-01-19 Tom Tromey <tom@tromey.com> * rust-lang.c (rust_lookup_symbol_nonlocal): Look up qualified symbols in the static and global blocks. 2018-01-19 Tom Tromey <tom@tromey.com> * gdb.rust/modules.rs (TWENTY_THREE): New global. * gdb.rust/modules.exp: Add ::-qualified lookup test.
97 lines
2.5 KiB
Rust
97 lines
2.5 KiB
Rust
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
|
|
|
|
// This program is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#![allow(dead_code)]
|
|
#![allow(unused_variables)]
|
|
#![allow(unused_assignments)]
|
|
|
|
fn f2() {
|
|
println!("::f2");
|
|
}
|
|
|
|
// See https://github.com/rust-lang/rust/pull/46457
|
|
#[no_mangle]
|
|
pub static TWENTY_THREE : u16 = 23;
|
|
|
|
pub struct Generic<T>(T);
|
|
|
|
pub struct Type;
|
|
|
|
pub mod mod1 {
|
|
pub struct Type(usize, isize);
|
|
|
|
pub mod inner {
|
|
pub struct Type(f64);
|
|
|
|
pub mod innest {
|
|
pub struct Type {pub x : u32}
|
|
|
|
fn wrap<T> (x: T) -> ::Generic<::Generic<T>> {
|
|
::Generic(::Generic(x))
|
|
}
|
|
|
|
pub fn f1 () {
|
|
struct Type(i8);
|
|
|
|
let x: u8 = 0;
|
|
|
|
let ct = ::Type;
|
|
let ctg = wrap(ct);
|
|
let m1t = ::mod1::Type(23, 97);
|
|
let m1tg = wrap(m1t);
|
|
let innert = super::Type(10101.5);
|
|
let innertg = wrap(innert);
|
|
let innestt = self::Type{x: 0xfff};
|
|
let innesttg = wrap(innestt);
|
|
let f1t = Type(9);
|
|
let f1tg = wrap(f1t);
|
|
|
|
let f2 = || println!("lambda f2");
|
|
|
|
let copy = ::TWENTY_THREE;
|
|
|
|
f2(); // set breakpoint here
|
|
f3();
|
|
self::f2();
|
|
super::f2();
|
|
self::super::f2();
|
|
self::super::super::f2();
|
|
super::super::f2();
|
|
::f2();
|
|
}
|
|
|
|
pub fn f2() {
|
|
println!("mod1::inner::innest::f2");
|
|
}
|
|
|
|
pub fn f3() {
|
|
println!("mod1::inner::innest::f3");
|
|
}
|
|
}
|
|
|
|
pub fn f2() {
|
|
println!("mod1::inner::f2");
|
|
}
|
|
}
|
|
|
|
pub fn f2() {
|
|
println!("mod1::f2");
|
|
}
|
|
}
|
|
|
|
fn main () {
|
|
mod1::inner::innest::f1();
|
|
}
|