-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #63875 - philipc:issue-57822, r=michaelwoerister
debuginfo: give unique names to closure and generator types Closure types have been moved to the namespace where they are defined, and both closure and generator type names now include the disambiguator. This fixes an exception when lldb prints nested closures. Fixes #57822 I haven't included the `DW_AT_artificial` changes discussed in #57822 because they make the output worse IMO, but I can easily add these if still required. For example, for the new test case the output is now: ``` (lldb) p g (issue_57822::main::closure-1) $1 = closure-1(closure(1)) ``` but adding `DW_AT_artificial` changes this to: ``` (lldb) p g (issue_57822::main::closure-1) $0 = closure-1 { } ``` Note that nested generators didn't cause the exception. I haven't determined why, but I think it makes sense to add the disambiguator for them too. It feels like we still don't really understand why closures were causing an error though. r? @michaelwoerister
- Loading branch information
Showing
4 changed files
with
80 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // This test makes sure that the LLDB pretty printer does not throw an exception | ||
| // for nested closures and generators. | ||
|
|
||
| // Require LLVM with DW_TAG_variant_part and a gdb that can read it. | ||
| // min-system-llvm-version: 8.0 | ||
| // min-gdb-version: 8.2 | ||
| // ignore-tidy-linelength | ||
|
|
||
| // compile-flags:-g | ||
|
|
||
| // === GDB TESTS =================================================================================== | ||
|
|
||
| // gdb-command:run | ||
|
|
||
| // gdb-command:print g | ||
| // gdb-check:$1 = issue_57822::main::closure-1 (issue_57822::main::closure-0 (1)) | ||
|
|
||
| // gdb-command:print b | ||
| // gdb-check:$2 = issue_57822::main::generator-3 {__0: issue_57822::main::generator-2 {__0: 2, <<variant>>: {[...]}}, <<variant>>: {[...]}} | ||
|
|
||
| // === LLDB TESTS ================================================================================== | ||
|
|
||
| // lldb-command:run | ||
|
|
||
| // lldb-command:print g | ||
| // lldbg-check:(issue_57822::main::closure-1) $0 = closure-1(closure-0(1)) | ||
|
|
||
| // lldb-command:print b | ||
| // lldbg-check:(issue_57822::main::generator-3) $1 = generator-3(generator-2(2)) | ||
|
|
||
| #![feature(omit_gdb_pretty_printer_section, generators, generator_trait)] | ||
| #![omit_gdb_pretty_printer_section] | ||
|
|
||
| use std::ops::Generator; | ||
| use std::pin::Pin; | ||
|
|
||
| fn main() { | ||
| let mut x = 1; | ||
| let f = move || x; | ||
| let g = move || f(); | ||
|
|
||
| let mut y = 2; | ||
| let mut a = move || { | ||
| y += 1; | ||
| yield; | ||
| }; | ||
| let mut b = move || { | ||
| Pin::new(&mut a).resume(); | ||
| yield; | ||
| }; | ||
|
|
||
| zzz(); // #break | ||
| } | ||
|
|
||
| fn zzz() { () } |