Skip to content

Commit 8e7a199

Browse files
committed
Update tests
1 parent beec6fd commit 8e7a199

17 files changed

Lines changed: 310 additions & 227 deletions

‎tests/unit/out/refcount/tag_vs_identifier_collision.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ pub struct point {
3434
__bytes: Value<Box<[u8]>>,
3535
}
3636
impl point {
37-
pub fn whole(&self) -> Ptr<i32> {
38-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
37+
pub fn whole(this: Ptr<Self>) -> Ptr<i32> {
38+
this.reinterpret_cast()
3939
}
40-
pub fn half(&self) -> Ptr<i16> {
41-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
40+
pub fn half(this: Ptr<Self>) -> Ptr<i16> {
41+
this.reinterpret_cast()
4242
}
4343
}
4444
impl Default for point {
@@ -56,11 +56,11 @@ pub struct slot_union {
5656
__bytes: Value<Box<[u8]>>,
5757
}
5858
impl slot_union {
59-
pub fn i(&self) -> Ptr<i32> {
60-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
59+
pub fn i(this: Ptr<Self>) -> Ptr<i32> {
60+
this.reinterpret_cast()
6161
}
62-
pub fn u(&self) -> Ptr<u32> {
63-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
62+
pub fn u(this: Ptr<Self>) -> Ptr<u32> {
63+
this.reinterpret_cast()
6464
}
6565
}
6666
impl Default for slot_union {
@@ -114,11 +114,11 @@ fn main_0() -> i32 {
114114
p.y = 4;
115115
assert!(((((p.x + p.y) == 7) as i32) != 0));
116116
let up: Value<point> = <Value<point>>::default();
117-
(*up.borrow()).whole().write(5);
118-
assert!((((((*up.borrow()).whole().read()) == 5) as i32) != 0));
117+
point::whole(up.as_pointer()).write(5);
118+
assert!(((((point::whole(up.as_pointer()).read()) == 5) as i32) != 0));
119119
let b: Value<slot_union> = <Value<slot_union>>::default();
120-
(*b.borrow()).i().write(9);
121-
assert!((((((*b.borrow()).i().read()) == 9) as i32) != 0));
120+
slot_union::i(b.as_pointer()).write(9);
121+
assert!(((((slot_union::i(b.as_pointer()).read()) == 9) as i32) != 0));
122122
let mut e: slot = slot_SLOT_B;
123123
assert!(((((e as u32) == ((slot_SLOT_B as i32) as u32)) as i32) != 0));
124124
let mut inner_tag: Inner = <Inner>::default();

‎tests/unit/out/refcount/union_addrof_external.rs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ pub struct anon_0 {
3737
__bytes: Value<Box<[u8]>>,
3838
}
3939
impl anon_0 {
40-
pub fn h(&self) -> Ptr<record> {
41-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
40+
pub fn h(this: Ptr<Self>) -> Ptr<record> {
41+
this.reinterpret_cast()
4242
}
43-
pub fn raw_(&self) -> Ptr<i8> {
44-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
43+
pub fn raw_(this: Ptr<Self>) -> Ptr<i8> {
44+
this.reinterpret_cast()
4545
}
4646
}
4747
impl Default for anon_0 {
@@ -101,10 +101,14 @@ fn main_0() -> i32 {
101101
let _cap: usize = 128usize;
102102
fill_1(_out, _cap)
103103
});
104-
assert!((((((*c.borrow()).view.h().with(|__s| __s.code) as i32) == 2) as i32) != 0));
104+
assert!(
105+
((((anon_0::h(field_ptr!(c.as_pointer(), view)).with(|__s| __s.code) as i32) == 2) as i32)
106+
!= 0)
107+
);
105108
assert!(
106109
(((((elem!(
107-
((field_ptr!((*c.borrow()).view.h(), lo)).reinterpret_cast::<u8>()),
110+
((field_ptr!(anon_0::h(field_ptr!(c.as_pointer(), view)), lo))
111+
.reinterpret_cast::<u8>()),
108112
0
109113
)
110114
.read()) as i32)
@@ -113,7 +117,8 @@ fn main_0() -> i32 {
113117
);
114118
assert!(
115119
(((((elem!(
116-
((field_ptr!((*c.borrow()).view.h(), lo)).reinterpret_cast::<u8>()),
120+
((field_ptr!(anon_0::h(field_ptr!(c.as_pointer(), view)), lo))
121+
.reinterpret_cast::<u8>()),
117122
1
118123
)
119124
.read()) as i32)
@@ -122,7 +127,7 @@ fn main_0() -> i32 {
122127
);
123128
assert!(
124129
(((((elem!(
125-
((*c.borrow()).view.raw_().reinterpret_cast::<i8>() as Ptr::<i8>),
130+
(anon_0::raw_(field_ptr!(c.as_pointer(), view)).reinterpret_cast::<i8>() as Ptr::<i8>),
126131
0
127132
)
128133
.read()) as i32)
@@ -131,7 +136,7 @@ fn main_0() -> i32 {
131136
);
132137
assert!(
133138
((((((elem!(
134-
((*c.borrow()).view.raw_().reinterpret_cast::<i8>() as Ptr::<i8>),
139+
(anon_0::raw_(field_ptr!(c.as_pointer(), view)).reinterpret_cast::<i8>() as Ptr::<i8>),
135140
3
136141
)
137142
.read()) as u8) as i32)

‎tests/unit/out/refcount/union_basic.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ pub struct basic {
1414
__bytes: Value<Box<[u8]>>,
1515
}
1616
impl basic {
17-
pub fn i(&self) -> Ptr<i32> {
18-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
17+
pub fn i(this: Ptr<Self>) -> Ptr<i32> {
18+
this.reinterpret_cast()
1919
}
20-
pub fn f(&self) -> Ptr<f32> {
21-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
20+
pub fn f(this: Ptr<Self>) -> Ptr<f32> {
21+
this.reinterpret_cast()
2222
}
2323
}
2424
impl Default for basic {
@@ -51,10 +51,10 @@ fn main_0() -> i32 {
5151
let u: Value<basic> = Rc::new(RefCell::new(<basic>::default()));
5252
let e: Value<empty> = Rc::new(RefCell::new(<empty>::default()));
5353
&(*e.borrow_mut());
54-
(*u.borrow()).i().write(42);
55-
assert!((((*u.borrow()).i().read()) == 42));
56-
(*u.borrow()).f().write(3.140000105E+0);
57-
assert!((((*u.borrow()).f().read()) == 3.140000105E+0));
54+
basic::i(u.as_pointer()).write(42);
55+
assert!(((basic::i(u.as_pointer()).read()) == 42));
56+
basic::f(u.as_pointer()).write(3.140000105E+0);
57+
assert!(((basic::f(u.as_pointer()).read()) == 3.140000105E+0));
5858
let buf: Value<Box<[u8]>> = Rc::new(RefCell::new((0..4).map(|_| 0_u8).collect::<Box<[u8]>>()));
5959
{
6060
((buf.as_pointer() as Ptr<u8>) as Ptr<u8>)
@@ -63,12 +63,12 @@ fn main_0() -> i32 {
6363
((buf.as_pointer() as Ptr<u8>) as Ptr<u8>).to_any()
6464
};
6565
let mut ru: Ptr<basic> = (buf.as_pointer() as Ptr<u8>).reinterpret_cast::<basic>();
66-
let mut pi: Ptr<i32> = ((*ru.upgrade().deref()).i()).clone();
67-
let mut pf: Ptr<f32> = ((*ru.upgrade().deref()).f()).clone();
68-
(*ru.upgrade().deref()).i().write(7);
66+
let mut pi: Ptr<i32> = (basic::i(ru.clone())).clone();
67+
let mut pf: Ptr<f32> = (basic::f(ru.clone())).clone();
68+
basic::i(ru.clone()).write(7);
6969
assert!(((pi.read()) == 7));
7070
pi.write(1065353216);
71-
assert!((((*ru.upgrade().deref()).i().read()) == 1065353216));
71+
assert!(((basic::i(ru.clone()).read()) == 1065353216));
7272
assert!(((pf.read()) == 1.0E+0));
7373
assert!((((*buf.borrow())[(3) as usize] as i32) == 63));
7474
return 0;

‎tests/unit/out/refcount/union_cross_arm_cast.rs‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ pub struct anon_0 {
5757
__bytes: Value<Box<[u8]>>,
5858
}
5959
impl anon_0 {
60-
pub fn a(&self) -> Ptr<shape_a> {
61-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
60+
pub fn a(this: Ptr<Self>) -> Ptr<shape_a> {
61+
this.reinterpret_cast()
6262
}
63-
pub fn b(&self) -> Ptr<shape_b> {
64-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
63+
pub fn b(this: Ptr<Self>) -> Ptr<shape_b> {
64+
this.reinterpret_cast()
6565
}
66-
pub fn raw_(&self) -> Ptr<i8> {
67-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
66+
pub fn raw_(this: Ptr<Self>) -> Ptr<i8> {
67+
this.reinterpret_cast()
6868
}
6969
}
7070
impl Default for anon_0 {
@@ -95,19 +95,28 @@ fn main_0() -> i32 {
9595
.memset((0) as u8, 68usize as usize);
9696
((c.as_pointer()) as Ptr<Container>).to_any()
9797
};
98-
field!((*c.borrow()).u.a(), code).write(10_u16);
98+
field!(anon_0::a(field_ptr!(c.as_pointer(), u)), code).write(10_u16);
9999
(*c.borrow_mut()).len = (28usize as u32);
100100
field!(
101-
(((*c.borrow()).u.a()).to_any().reinterpret_cast::<shape_b>()),
101+
((anon_0::a(field_ptr!(c.as_pointer(), u)))
102+
.to_any()
103+
.reinterpret_cast::<shape_b>()),
102104
tail
103105
)
104106
.write(3735928559_u32);
105-
assert!(((((*c.borrow()).u.b().with(|__s| __s.tail) == 3735928559_u32) as i32) != 0));
106-
assert!((((((*c.borrow()).u.b().with(|__s| __s.code) as i32) == 10) as i32) != 0));
107-
field!((*c.borrow()).u.b(), lo).write(8080_u16);
107+
assert!(
108+
(((anon_0::b(field_ptr!(c.as_pointer(), u)).with(|__s| __s.tail) == 3735928559_u32)
109+
as i32)
110+
!= 0)
111+
);
112+
assert!(
113+
((((anon_0::b(field_ptr!(c.as_pointer(), u)).with(|__s| __s.code) as i32) == 10) as i32)
114+
!= 0)
115+
);
116+
field!(anon_0::b(field_ptr!(c.as_pointer(), u)), lo).write(8080_u16);
108117
assert!(
109118
(((((elem!(
110-
((((*c.borrow()).u.raw_().reinterpret_cast::<i8>()) as Ptr<i8>)
119+
(((anon_0::raw_(field_ptr!(c.as_pointer(), u)).reinterpret_cast::<i8>()) as Ptr<i8>)
111120
.reinterpret_cast::<u8>()),
112121
2
113122
)
@@ -117,7 +126,7 @@ fn main_0() -> i32 {
117126
);
118127
assert!(
119128
(((((elem!(
120-
((((*c.borrow()).u.raw_().reinterpret_cast::<i8>()) as Ptr<i8>)
129+
(((anon_0::raw_(field_ptr!(c.as_pointer(), u)).reinterpret_cast::<i8>()) as Ptr<i8>)
121130
.reinterpret_cast::<u8>()),
122131
3
123132
)

‎tests/unit/out/refcount/union_field_alignment.rs‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ pub struct anon_0 {
1414
__bytes: Value<Box<[u8]>>,
1515
}
1616
impl anon_0 {
17-
pub fn bytes(&self) -> Ptr<u8> {
18-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
17+
pub fn bytes(this: Ptr<Self>) -> Ptr<u8> {
18+
this.reinterpret_cast()
1919
}
20-
pub fn aligner(&self) -> Ptr<AnyPtr> {
21-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
20+
pub fn aligner(this: Ptr<Self>) -> Ptr<AnyPtr> {
21+
this.reinterpret_cast()
2222
}
2323
}
2424
impl Default for anon_0 {
@@ -43,12 +43,20 @@ pub fn main() {
4343
std::process::exit(main_0());
4444
}
4545
fn main_0() -> i32 {
46-
let mut n: node = <node>::default();
47-
n.next = Ptr::<node>::null();
48-
elem!((n.x.bytes().reinterpret_cast::<u8>() as Ptr::<u8>), 0).write(171_u8);
46+
let n: Value<node> = <Value<node>>::default();
47+
(*n.borrow_mut()).next = Ptr::<node>::null();
48+
elem!(
49+
(anon_0::bytes(field_ptr!(n.as_pointer(), x)).reinterpret_cast::<u8>() as Ptr::<u8>),
50+
0
51+
)
52+
.write(171_u8);
4953
assert!(
50-
(((((elem!((n.x.bytes().reinterpret_cast::<u8>() as Ptr::<u8>), 0).read()) as i32) == 171)
51-
as i32)
54+
(((((elem!(
55+
(anon_0::bytes(field_ptr!(n.as_pointer(), x)).reinterpret_cast::<u8>() as Ptr::<u8>),
56+
0
57+
)
58+
.read()) as i32)
59+
== 171) as i32)
5260
!= 0)
5361
);
5462
return 0;

‎tests/unit/out/refcount/union_flex_array_member.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ pub struct anon_0 {
1414
__bytes: Value<Box<[u8]>>,
1515
}
1616
impl anon_0 {
17-
pub fn bytes(&self) -> Ptr<u8> {
18-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
17+
pub fn bytes(this: Ptr<Self>) -> Ptr<u8> {
18+
this.reinterpret_cast()
1919
}
20-
pub fn aligner(&self) -> Ptr<AnyPtr> {
21-
(self.__bytes.as_pointer() as Ptr<u8>).reinterpret_cast()
20+
pub fn aligner(this: Ptr<Self>) -> Ptr<AnyPtr> {
21+
this.reinterpret_cast()
2222
}
2323
}
2424
impl Default for anon_0 {
@@ -52,7 +52,7 @@ fn main_0() -> i32 {
5252
let mut i: usize = 0_usize;
5353
'loop_: while (((i < tail_size) as i32) != 0) {
5454
elem!(
55-
((*n.upgrade().deref()).x.bytes().reinterpret_cast::<u8>() as Ptr::<u8>),
55+
(anon_0::bytes(field_ptr!(n, x)).reinterpret_cast::<u8>() as Ptr::<u8>),
5656
i
5757
)
5858
.write({ ((i & 255_usize) as u8) });
@@ -63,7 +63,7 @@ fn main_0() -> i32 {
6363
assert!(
6464
((({
6565
((elem!(
66-
((*n.upgrade().deref()).x.bytes().reinterpret_cast::<u8>() as Ptr::<u8>),
66+
(anon_0::bytes(field_ptr!(n, x)).reinterpret_cast::<u8>() as Ptr::<u8>),
6767
i
6868
)
6969
.read()) as i32)
@@ -72,21 +72,21 @@ fn main_0() -> i32 {
7272
);
7373
i.postfix_inc();
7474
}
75-
let mut p: Ptr<u8> = (((*n.upgrade().deref()).x.bytes().reinterpret_cast::<u8>() as Ptr<u8>)
75+
let mut p: Ptr<u8> = ((anon_0::bytes(field_ptr!(n, x)).reinterpret_cast::<u8>() as Ptr<u8>)
7676
.offset((10) as isize));
7777
assert!((((((p.read()) as i32) == 10) as i32) != 0));
7878
p.write(170_u8);
7979
assert!(
8080
(((((elem!(
81-
((*n.upgrade().deref()).x.bytes().reinterpret_cast::<u8>() as Ptr::<u8>),
81+
(anon_0::bytes(field_ptr!(n, x)).reinterpret_cast::<u8>() as Ptr::<u8>),
8282
10
8383
)
8484
.read()) as i32)
8585
== 170) as i32)
8686
!= 0)
8787
);
8888
field!(n, pos).write(20_usize);
89-
let mut q: Ptr<u8> = (((*n.upgrade().deref()).x.bytes().reinterpret_cast::<u8>() as Ptr<u8>)
89+
let mut q: Ptr<u8> = ((anon_0::bytes(field_ptr!(n, x)).reinterpret_cast::<u8>() as Ptr<u8>)
9090
.offset((n.with(|__s| __s.pos)) as isize));
9191
assert!((((((q.read()) as i32) == 20) as i32) != 0));
9292
q.write(187_u8);

0 commit comments

Comments
 (0)