Skip to content

Commit 14a6aa7

Browse files
authored
Rollup merge of rust-lang#58629 - euclio:debug-empty-str, r=alexcrichton
rust-lldb: fix crash when printing empty string Fixes rust-lang#52185. ~Re-enables the pretty-std debuginfo test and tweaks the test as necessary to get it to pass again. This reveals that lldb's formatting of enums is broken (rust-lang#58492). I also removed the emoji from the test because I couldn't get the docker image's gdb to print the emoji, just octal escapes (https://github.com/rust-lang/rust/pull/53154/files#r208263904).~
2 parents 83362be + 9e5def9 commit 14a6aa7

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

src/etc/lldb_rust_formatters.py

+2
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@ def render_element(i):
290290

291291

292292
def read_utf8_string(ptr_val, byte_count):
293+
if byte_count == 0:
294+
return '""'
293295
error = lldb.SBError()
294296
process = ptr_val.get_wrapped_value().GetProcess()
295297
data = process.ReadMemory(ptr_val.as_integer(), byte_count, error)

src/test/debuginfo/empty-string.rs

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// ignore-windows failing on win32 bot
2+
// ignore-android: FIXME(#10381)
3+
// compile-flags:-g
4+
// min-gdb-version: 7.7
5+
// min-lldb-version: 310
6+
7+
// === GDB TESTS ===================================================================================
8+
9+
// gdb-command: run
10+
11+
// gdb-command: print empty_string
12+
// gdb-check:$1 = ""
13+
14+
// gdb-command: print empty_str
15+
// gdb-check:$2 = ""
16+
17+
// === LLDB TESTS ==================================================================================
18+
19+
// lldb-command: run
20+
21+
// lldb-command: fr v empty_string
22+
// lldb-check:[...]empty_string = ""
23+
24+
// lldb-command: fr v empty_str
25+
// lldb-check:[...]empty_str = ""
26+
27+
fn main() {
28+
let empty_string = String::new();
29+
30+
let empty_str = "";
31+
32+
zzz(); // #break
33+
}
34+
35+
fn zzz() {}

0 commit comments

Comments
 (0)