about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-11-07 18:02:03 +0800
committerkennytm <kennytm@gmail.com>2018-11-07 21:26:54 +0800
commitdd9ea2ae64198b85d54da849ace5d43b81b9f519 (patch)
treeb406f4bedef7adc4409c3642c03e8c8de5aa19b3
parent6f10e34fd3f4eeb58f5215339215971de996a5cf (diff)
parent2869fda12c0bd8386371e6e1cac098cf05ed2a5b (diff)
Rollup merge of #55728 - tromey:update-lldb, r=alexcrichton
Update lldb

This updates lldb to pick up some bug fixes, and makes one minor test
suite fix to account for this.
-rw-r--r--src/test/debuginfo/vec-slices.rs2
m---------src/tools/lldb0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/test/debuginfo/vec-slices.rs b/src/test/debuginfo/vec-slices.rs
index 39267edaac0..dba3972a3df 100644
--- a/src/test/debuginfo/vec-slices.rs
+++ b/src/test/debuginfo/vec-slices.rs
@@ -99,7 +99,7 @@
 
 // lldb-command:print padded_tuple
 // lldbg-check:[...]$4 = &[(6, 7), (8, 9)]
-// lldbr-check:(&[(i32, i16)]) padded_tuple = { data_ptr = *0x555555555030 length = 2 }
+// lldbr-check:(&[(i32, i16)]) padded_tuple = { data_ptr = *[...] length = 2 }
 
 // lldb-command:print padded_struct
 // lldbg-check:[...]$5 = &[AStruct { x: 10, y: 11, z: 12 }, AStruct { x: 13, y: 14, z: 15 }]
diff --git a/src/tools/lldb b/src/tools/lldb
-Subproject 29bf48582812212450f4caf7da1af3f18c52bfe
+Subproject fdea743be550ed8d7b61b2c908944cdd1290a6a