mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
Make option-like-enum.rs UB-free and portable
This commit is contained in:
parent
1a94d839be
commit
1a2ec2634e
@ -8,22 +8,22 @@
|
||||
// gdb-command:run
|
||||
|
||||
// gdb-command:print some
|
||||
// gdb-check:$1 = core::option::Option<&u32>::Some(0x12345678)
|
||||
// gdb-check:$1 = core::option::Option<&u32>::Some(0x[...])
|
||||
|
||||
// gdb-command:print none
|
||||
// gdb-check:$2 = core::option::Option<&u32>::None
|
||||
|
||||
// gdb-command:print full
|
||||
// gdb-check:$3 = option_like_enum::MoreFields::Full(454545, 0x87654321, 9988)
|
||||
// gdb-check:$3 = option_like_enum::MoreFields::Full(454545, 0x[...], 9988)
|
||||
|
||||
// gdb-command:print empty_gdb.discr
|
||||
// gdb-check:$4 = (*mut isize) 0x1
|
||||
// gdb-command:print empty
|
||||
// gdb-check:$4 = option_like_enum::MoreFields::Empty
|
||||
|
||||
// gdb-command:print droid
|
||||
// gdb-check:$5 = option_like_enum::NamedFields::Droid{id: 675675, range: 10000001, internals: 0x43218765}
|
||||
// gdb-check:$5 = option_like_enum::NamedFields::Droid{id: 675675, range: 10000001, internals: 0x[...]}
|
||||
|
||||
// gdb-command:print void_droid_gdb.internals
|
||||
// gdb-check:$6 = (*mut isize) 0x1
|
||||
// gdb-command:print void_droid
|
||||
// gdb-check:$6 = option_like_enum::NamedFields::Void
|
||||
|
||||
// gdb-command:print nested_non_zero_yep
|
||||
// gdb-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, option_like_enum::NestedNonZeroField {a: 10, b: 20, c: 0x[...]})
|
||||
@ -39,19 +39,19 @@
|
||||
// lldb-command:run
|
||||
|
||||
// lldb-command:v some
|
||||
// lldb-check:[...] Some(&0x12345678)
|
||||
// lldb-check:[...] Some(&0x[...])
|
||||
|
||||
// lldb-command:v none
|
||||
// lldb-check:[...] None
|
||||
|
||||
// lldb-command:v full
|
||||
// lldb-check:[...] Full(454545, &0x87654321, 9988)
|
||||
// lldb-check:[...] Full(454545, &0x[...], 9988)
|
||||
|
||||
// lldb-command:v empty
|
||||
// lldb-check:[...] Empty
|
||||
|
||||
// lldb-command:v droid
|
||||
// lldb-check:[...] Droid { id: 675675, range: 10000001, internals: &0x43218765 }
|
||||
// lldb-check:[...] Droid { id: 675675, range: 10000001, internals: &0x[...] }
|
||||
|
||||
// lldb-command:v void_droid
|
||||
// lldb-check:[...] Void
|
||||
@ -76,11 +76,6 @@
|
||||
// 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).
|
||||
|
||||
enum MoreFields<'a> {
|
||||
Full(u32, &'a isize, i16),
|
||||
@ -120,32 +115,26 @@ fn main() {
|
||||
let some_str: Option<&'static str> = Some("abc");
|
||||
let none_str: Option<&'static str> = None;
|
||||
|
||||
let some: Option<&u32> = Some(unsafe { std::mem::transmute(0x12345678_usize) });
|
||||
let some: Option<&u32> = Some(&1234);
|
||||
let none: Option<&u32> = None;
|
||||
|
||||
let full = MoreFields::Full(454545, unsafe { std::mem::transmute(0x87654321_usize) }, 9988);
|
||||
|
||||
let full = MoreFields::Full(454545, &1234, 9988);
|
||||
let empty = MoreFields::Empty;
|
||||
let empty_gdb: &MoreFieldsRepr = unsafe { std::mem::transmute(&MoreFields::Empty) };
|
||||
|
||||
let droid = NamedFields::Droid {
|
||||
id: 675675,
|
||||
range: 10000001,
|
||||
internals: unsafe { std::mem::transmute(0x43218765_usize) }
|
||||
internals: &1234,
|
||||
};
|
||||
|
||||
let void_droid = NamedFields::Void;
|
||||
let void_droid_gdb: &NamedFieldsRepr = unsafe { std::mem::transmute(&NamedFields::Void) };
|
||||
|
||||
let x = 'x';
|
||||
let nested_non_zero_yep = NestedNonZero::Yep(
|
||||
10.5,
|
||||
NestedNonZeroField {
|
||||
a: 10,
|
||||
b: 20,
|
||||
c: &x
|
||||
c: &'x',
|
||||
});
|
||||
|
||||
let nested_non_zero_nope = NestedNonZero::Nope;
|
||||
|
||||
zzz(); // #break
|
||||
|
Loading…
Reference in New Issue
Block a user