Update debuginfo tests.

diff --git a/src/test/debuginfo/option-like-enum.rs b/src/test/debuginfo/option-like-enum.rs
index 5c44703f6f2c90b712d394a3a5aaa115b1527903..803d0aed593a3d8439e2cb379ecfb9c16b7371b6 100644 (file)
--- a/src/test/debuginfo/option-like-enum.rs
+++ b/src/test/debuginfo/option-like-enum.rs
@@ -16,10 +16,10 @@
 // gdb-command:finish
 
 // gdb-command:print some
-// gdb-check:$1 = {0x12345678}
+// gdb-check:$1 = (u32 *) 0x12345678
 
 // gdb-command:print none
-// gdb-check:$2 = {0x0}
+// gdb-check:$2 = (u32 *) 0x0
 
 // gdb-command:print full
 // gdb-check:$3 = {454545, 0x87654321, 9988}
@@ -41,6 +41,8 @@
 // contains a non-nullable pointer, then this value is used as the discriminator.
 // The test cases in this file make sure that something readable is generated for
 // this kind of types.
+// If the non-empty variant contains a single non-nullable pointer than the whole
+// item is represented as just a pointer and not wrapped in a struct.
 // Unfortunately (for these test cases) the content of the non-discriminant fields
 // in the null-case is not defined. So we just read the discriminator field in
 // this case (by casting the value to a memory-equivalent struct).

diff --git a/src/test/debuginfo/recursive-struct.rs b/src/test/debuginfo/recursive-struct.rs
index 8c2edbea0d477c718d20a641f911607ea7ce57d6..aa13072eb5316606935026b6d77aa9ca5ef61478 100644 (file)
--- a/src/test/debuginfo/recursive-struct.rs
+++ b/src/test/debuginfo/recursive-struct.rs
@@ -20,53 +20,53 @@
 
 // gdb-command:print stack_unique.value
 // gdb-check:$1 = 0
-// gdb-command:print stack_unique.next.val->value
+// gdb-command:print stack_unique.next->value
 // gdb-check:$2 = 1
 
 // gdb-command:print unique_unique->value
 // gdb-check:$3 = 2
-// gdb-command:print unique_unique->next.val->value
+// gdb-command:print unique_unique->next->value
 // gdb-check:$4 = 3
 
 // gdb-command:print box_unique->val.value
 // gdb-check:$5 = 4
-// gdb-command:print box_unique->val.next.val->value
+// gdb-command:print box_unique->val.next->value
 // gdb-check:$6 = 5
 
 // gdb-command:print vec_unique[0].value
 // gdb-check:$7 = 6.5
-// gdb-command:print vec_unique[0].next.val->value
+// gdb-command:print vec_unique[0].next->value
 // gdb-check:$8 = 7.5
 
 // gdb-command:print borrowed_unique->value
 // gdb-check:$9 = 8.5
-// gdb-command:print borrowed_unique->next.val->value
+// gdb-command:print borrowed_unique->next->value
 // gdb-check:$10 = 9.5
 
 // MANAGED
 // gdb-command:print stack_managed.value
 // gdb-check:$11 = 10
-// gdb-command:print stack_managed.next.val->val.value
+// gdb-command:print stack_managed.next.val->value
 // gdb-check:$12 = 11
 
 // gdb-command:print unique_managed->value
 // gdb-check:$13 = 12
-// gdb-command:print unique_managed->next.val->val.value
+// gdb-command:print unique_managed->next.val->value
 // gdb-check:$14 = 13
 
-// gdb-command:print box_managed->val.value
+// gdb-command:print box_managed.val->value
 // gdb-check:$15 = 14
-// gdb-command:print box_managed->val.next.val->val.value
+// gdb-command:print box_managed->val->next.val->value
 // gdb-check:$16 = 15
 
 // gdb-command:print vec_managed[0].value
 // gdb-check:$17 = 16.5
-// gdb-command:print vec_managed[0].next.val->val.value
+// gdb-command:print vec_managed[0].next.val->value
 // gdb-check:$18 = 17.5
 
 // gdb-command:print borrowed_managed->value
 // gdb-check:$19 = 18.5
-// gdb-command:print borrowed_managed->next.val->val.value
+// gdb-command:print borrowed_managed->next.val->value
 // gdb-check:$20 = 19.5
 
 // LONG CYCLE
@@ -97,7 +97,7 @@
 // gdb-command:print (*****long_cycle_w_anonymous_types).value
 // gdb-check:$31 = 30
 
-// gdb-command:print (*****((*****long_cycle_w_anonymous_types).next.val)).value
+// gdb-command:print (*****((*****long_cycle_w_anonymous_types).next)).value
 // gdb-check:$32 = 31
 
 // gdb-command:continue