Skip to content

Commit 9cbd9df

Browse files
committed
Update tests
1 parent 87b9e36 commit 9cbd9df

33 files changed

Lines changed: 121 additions & 115 deletions

tests/benchmarks/out/refcount/sum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub fn main() {
1010
std::process::exit(main_0());
1111
}
1212
fn main_0() -> i32 {
13-
let N: Value<i64> = Rc::new(RefCell::new(25000000000_i64));
13+
let N: Value<i64> = Rc::new(RefCell::new(25000000000));
1414
let sum: Value<i64> = Rc::new(RefCell::new(0_i64));
1515
let i: Value<i64> = Rc::new(RefCell::new(0_i64));
1616
let j: Value<i64> = Rc::new(RefCell::new((*N.borrow())));

tests/benchmarks/out/unsafe/sum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn main() {
1212
}
1313
}
1414
unsafe fn main_0() -> i32 {
15-
let mut N: i64 = 25000000000_i64;
15+
let mut N: i64 = 25000000000;
1616
let mut sum: i64 = 0_i64;
1717
let mut i: i64 = 0_i64;
1818
let mut j: i64 = N;

tests/unit/out/refcount/bool_condition_logical.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn main_0() -> i32 {
4545
let zero: Value<i32> = Rc::new(RefCell::new(0));
4646
let storage: Value<i32> = Rc::new(RefCell::new(7));
4747
let p: Value<Ptr<i32>> = Rc::new(RefCell::new((storage.as_pointer())));
48-
let np: Value<Ptr<i32>> = Rc::new(RefCell::new(Ptr::<i32>::null()));
48+
let np: Value<Ptr<i32>> = Rc::new(RefCell::new(Default::default()));
4949
let u: Value<u32> = Rc::new(RefCell::new(4_u32));
5050
let code: Value<Code> = Rc::new(RefCell::new(Code::CODE_OK));
5151
if ((*n.borrow()) != 0) && (!(*p.borrow()).is_null()) {
@@ -86,48 +86,48 @@ fn main_0() -> i32 {
8686
assert!(((*side_effect.with(Value::clone).borrow()) == 0));
8787
let x: Value<i32> = Rc::new(RefCell::new(5));
8888
let y: Value<i32> = Rc::new(RefCell::new(3));
89-
let flags: Value<u32> = Rc::new(RefCell::new(2_u32));
90-
if ((*x.borrow()) > (*y.borrow())) || (((*flags.borrow()) & 1_u32) != 0) {
89+
let flags: Value<u32> = Rc::new(RefCell::new(2));
90+
if ((*x.borrow()) > (*y.borrow())) || (((*flags.borrow()) & 1) != 0) {
9191
assert!(true);
9292
}
93-
if ((*x.borrow()) < (*y.borrow())) || (((*flags.borrow()) & 1_u32) != 0) {
93+
if ((*x.borrow()) < (*y.borrow())) || (((*flags.borrow()) & 1) != 0) {
9494
assert!(false);
9595
}
96-
let a: Value<u32> = Rc::new(RefCell::new(1_u32));
97-
let b: Value<u32> = Rc::new(RefCell::new(2_u32));
98-
let c: Value<u32> = Rc::new(RefCell::new(3_u32));
96+
let a: Value<u32> = Rc::new(RefCell::new(1));
97+
let b: Value<u32> = Rc::new(RefCell::new(2));
98+
let c: Value<u32> = Rc::new(RefCell::new(3));
9999
if ((*a.borrow()) != (*c.borrow())) && ((*b.borrow()) != (*c.borrow())) {
100100
assert!(true);
101101
}
102102
let s: Value<i32> = Rc::new(RefCell::new(-1_i32));
103103
if (!((*p.borrow()).is_null())) && ((*s.borrow()) < 0) {
104104
assert!(true);
105105
}
106-
let k: Value<u32> = Rc::new(RefCell::new(2_u32));
106+
let k: Value<u32> = Rc::new(RefCell::new(2));
107107
let done: Value<bool> = Rc::new(RefCell::new(false));
108-
if ((*k.borrow()) > 1_u32) || (!(*done.borrow())) {
108+
if ((*k.borrow()) > 1) || (!(*done.borrow())) {
109109
assert!(true);
110110
}
111-
if ((*x.borrow()) > (*y.borrow())) || (((*flags.borrow()) & 4_u32) != 0) {
111+
if ((*x.borrow()) > (*y.borrow())) || (((*flags.borrow()) & 4) != 0) {
112112
assert!(true);
113113
}
114-
let ull: Value<u64> = Rc::new(RefCell::new(7_u64));
114+
let ull: Value<u64> = Rc::new(RefCell::new(7));
115115
if (!((*p.borrow()).is_null())) && ((*ull.borrow()) != 0) {
116116
assert!(true);
117117
}
118118
if ((*x.borrow()) > (*y.borrow())) && ((*ull.borrow()) != 0) {
119119
assert!(true);
120120
}
121-
let mask: Value<i64> = Rc::new(RefCell::new(((1_i64 << 4) | (1_i64 << 5))));
122-
let bits: Value<i64> = Rc::new(RefCell::new((1_i64 << 4)));
121+
let mask: Value<i64> = Rc::new(RefCell::new(((1 << 4) | (1 << 5))));
122+
let bits: Value<i64> = Rc::new(RefCell::new((1 << 4)));
123123
if ((*n.borrow()) != 0) && (((*bits.borrow()) & (*mask.borrow())) != 0) {
124124
assert!(true);
125125
}
126-
if ((*n.borrow()) != 0) || (((*bits.borrow()) & 256_i64) != 0) {
126+
if ((*n.borrow()) != 0) || (((*bits.borrow()) & 256) != 0) {
127127
assert!(true);
128128
}
129129
let cp: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal("hi")));
130-
let cnp: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::<u8>::null()));
130+
let cnp: Value<Ptr<u8>> = Rc::new(RefCell::new(Default::default()));
131131
if ((*x.borrow()) > (*y.borrow())) && (!(*cp.borrow()).is_null()) {
132132
assert!(true);
133133
}

tests/unit/out/refcount/bool_condition_logical_c.rs

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn main_0() -> i32 {
4545
let zero: Value<i32> = Rc::new(RefCell::new(0));
4646
let storage: Value<i32> = Rc::new(RefCell::new(7));
4747
let p: Value<Ptr<i32>> = Rc::new(RefCell::new((storage.as_pointer())));
48-
let np: Value<Ptr<i32>> = Rc::new(RefCell::new(Ptr::<i32>::null()));
48+
let np: Value<Ptr<i32>> = Rc::new(RefCell::new(Default::default()));
4949
let u: Value<u32> = Rc::new(RefCell::new(4_u32));
5050
let code: Value<Code> = Rc::new(RefCell::new(Code::CODE_OK));
5151
if (((((*n.borrow()) != 0) && (!(*p.borrow()).is_null())) as i32) != 0) {
@@ -92,67 +92,69 @@ fn main_0() -> i32 {
9292
assert!(((((*side_effect.with(Value::clone).borrow()) == 0) as i32) != 0));
9393
let x: Value<i32> = Rc::new(RefCell::new(5));
9494
let y: Value<i32> = Rc::new(RefCell::new(3));
95-
let flags: Value<u32> = Rc::new(RefCell::new(2_u32));
96-
if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 1_u32) != 0))
95+
let flags: Value<u32> = Rc::new(RefCell::new(2));
96+
if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 1) != 0))
9797
as i32)
9898
!= 0)
9999
{
100100
assert!((1 != 0));
101101
}
102-
if (((((((*x.borrow()) < (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 1_u32) != 0))
102+
if (((((((*x.borrow()) < (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 1) != 0))
103103
as i32)
104104
!= 0)
105105
{
106106
assert!((0 != 0));
107107
}
108-
let a: Value<u32> = Rc::new(RefCell::new(1_u32));
109-
let b: Value<u32> = Rc::new(RefCell::new(2_u32));
110-
let c: Value<u32> = Rc::new(RefCell::new(3_u32));
108+
let a: Value<u32> = Rc::new(RefCell::new(1));
109+
let b: Value<u32> = Rc::new(RefCell::new(2));
110+
let c: Value<u32> = Rc::new(RefCell::new(3));
111111
if (((((((*a.borrow()) != (*c.borrow())) as i32) != 0)
112112
&& ((((*b.borrow()) != (*c.borrow())) as i32) != 0)) as i32)
113113
!= 0)
114114
{
115115
assert!((1 != 0));
116116
}
117117
let s: Value<i32> = Rc::new(RefCell::new(-1_i32));
118-
if ((((((!((*p.borrow()).is_null())) as i32) != 0) && ((((*s.borrow()) < 0) as i32) != 0))
119-
as i32)
118+
if (((((((*p.borrow()) != (Default::default())) as i32) != 0)
119+
&& ((((*s.borrow()) < 0) as i32) != 0)) as i32)
120120
!= 0)
121121
{
122122
assert!((1 != 0));
123123
}
124-
let k: Value<u32> = Rc::new(RefCell::new(2_u32));
124+
let k: Value<u32> = Rc::new(RefCell::new(2));
125125
let done: Value<bool> = Rc::new(RefCell::new((0 != 0)));
126-
if (((((((*k.borrow()) > 1_u32) as i32) != 0) || (!(*done.borrow()))) as i32) != 0) {
126+
if (((((((*k.borrow()) > 1) as i32) != 0) || (!(*done.borrow()))) as i32) != 0) {
127127
assert!((1 != 0));
128128
}
129-
if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 4_u32) != 0))
129+
if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 4) != 0))
130130
as i32)
131131
!= 0)
132132
{
133133
assert!((1 != 0));
134134
}
135-
let ull: Value<u64> = Rc::new(RefCell::new(7_u64));
136-
if ((((((!((*p.borrow()).is_null())) as i32) != 0) && ((*ull.borrow()) != 0)) as i32) != 0) {
135+
let ull: Value<u64> = Rc::new(RefCell::new(7));
136+
if (((((((*p.borrow()) != (Default::default())) as i32) != 0) && ((*ull.borrow()) != 0))
137+
as i32)
138+
!= 0)
139+
{
137140
assert!((1 != 0));
138141
}
139142
if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) && ((*ull.borrow()) != 0)) as i32) != 0) {
140143
assert!((1 != 0));
141144
}
142-
let mask: Value<i64> = Rc::new(RefCell::new(((1_i64 << 4) | (1_i64 << 5))));
143-
let bits: Value<i64> = Rc::new(RefCell::new((1_i64 << 4)));
145+
let mask: Value<i64> = Rc::new(RefCell::new(((1 << 4) | (1 << 5))));
146+
let bits: Value<i64> = Rc::new(RefCell::new((1 << 4)));
144147
if (((((((*n.borrow()) != 0) as i32) != 0) && (((*bits.borrow()) & (*mask.borrow())) != 0))
145148
as i32)
146149
!= 0)
147150
{
148151
assert!((1 != 0));
149152
}
150-
if (((((((*n.borrow()) != 0) as i32) != 0) || (((*bits.borrow()) & 256_i64) != 0)) as i32) != 0)
151-
{
153+
if (((((((*n.borrow()) != 0) as i32) != 0) || (((*bits.borrow()) & 256) != 0)) as i32) != 0) {
152154
assert!((1 != 0));
153155
}
154156
let cp: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal("hi")));
155-
let cnp: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::<u8>::null()));
157+
let cnp: Value<Ptr<u8>> = Rc::new(RefCell::new(Default::default()));
156158
if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) && (!(*cp.borrow()).is_null())) as i32)
157159
!= 0)
158160
{
@@ -191,7 +193,8 @@ fn main_0() -> i32 {
191193
{
192194
assert!((0 != 0));
193195
}
194-
if (((((((((!((*p.borrow()).is_null())) as i32) != 0) && (({ returns_one_1() }) != 0)) as i32)
196+
if ((((((((((*p.borrow()) != (Default::default())) as i32) != 0)
197+
&& (({ returns_one_1() }) != 0)) as i32)
195198
!= 0)
196199
&& ((((*n.borrow()) != 0) as i32) != 0)) as i32)
197200
!= 0)

tests/unit/out/refcount/int_to_bool_explicit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn main() {
1212
fn main_0() -> i32 {
1313
let flag: Value<u32> = Rc::new(RefCell::new(7_u32));
1414
let b1: Value<bool> = Rc::new(RefCell::new(((*flag.borrow()) != 0)));
15-
let b2: Value<bool> = Rc::new(RefCell::new((0_u32 != 0)));
15+
let b2: Value<bool> = Rc::new(RefCell::new((0 != 0)));
1616
assert!((*b1.borrow()));
1717
assert!(!(*b2.borrow()));
1818
return 0;

tests/unit/out/refcount/int_to_bool_explicit_c.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn main() {
1212
fn main_0() -> i32 {
1313
let flag: Value<u32> = Rc::new(RefCell::new(7_u32));
1414
let b1: Value<bool> = Rc::new(RefCell::new(((*flag.borrow()) != 0)));
15-
let b2: Value<bool> = Rc::new(RefCell::new((0_u32 != 0)));
15+
let b2: Value<bool> = Rc::new(RefCell::new((0 != 0)));
1616
assert!((*b1.borrow()));
1717
assert!(((!(*b2.borrow()) as i32) != 0));
1818
return 0;

tests/unit/out/refcount/printfs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn main() {
2424
}
2525
fn main_0() -> i32 {
2626
println!("{}", Ptr::from_string_literal("fprintf stdout"));
27-
println!("{} {} {}", 1, 2_u32, 3_i64);
27+
println!("{} {} {}", 1, 2, 3);
2828
print!("hello world");
2929
println!("{}", Ptr::from_string_literal("printf"));
3030
print!("hello world");

tests/unit/out/refcount/reinterpret_cast_aliased.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ fn main_0() -> i32 {
1515
Rc::new(RefCell::new((val.as_pointer()).reinterpret_cast::<u32>()));
1616
let view2: Value<Ptr<u32>> =
1717
Rc::new(RefCell::new((val.as_pointer()).reinterpret_cast::<u32>()));
18-
(*view1.borrow()).offset((0) as isize).write(3721182122_u32);
19-
assert!((((*view2.borrow()).offset((0) as isize).read()) == 3721182122_u32));
20-
assert!(((*val.borrow()) == 578437699406183338_u64));
21-
(*view2.borrow()).offset((1) as isize).write(4293844428_u32);
22-
assert!((((*view1.borrow()).offset((1) as isize).read()) == 4293844428_u32));
23-
assert!(((*val.borrow()) == 18441921396093008810_u64));
18+
(*view1.borrow()).offset((0) as isize).write(3721182122);
19+
assert!((((*view2.borrow()).offset((0) as isize).read()) == 3721182122));
20+
assert!(((*val.borrow()) == 578437699406183338));
21+
(*view2.borrow()).offset((1) as isize).write(4293844428);
22+
assert!((((*view1.borrow()).offset((1) as isize).read()) == 4293844428));
23+
assert!(((*val.borrow()) == 18441921396093008810));
2424
return 0;
2525
}

tests/unit/out/refcount/reinterpret_cast_chain.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ fn main_0() -> i32 {
2323
assert!(((((*words.borrow()).offset((2) as isize).read()) as i32) == 1541));
2424
assert!(((((*words.borrow()).offset((3) as isize).read()) as i32) == 2055));
2525
(*words.borrow()).offset((1) as isize).write(48042_u16);
26-
assert!((((*dwords.borrow()).offset((0) as isize).read()) == 3148481025_u32));
27-
assert!(((*val.borrow()) == 578437698833482241_u64));
28-
(*dwords.borrow())
29-
.offset((1) as isize)
30-
.write(4293844428_u32);
31-
assert!(((*val.borrow()) == 18441921395520307713_u64));
26+
assert!((((*dwords.borrow()).offset((0) as isize).read()) == 3148481025));
27+
assert!(((*val.borrow()) == 578437698833482241));
28+
(*dwords.borrow()).offset((1) as isize).write(4293844428);
29+
assert!(((*val.borrow()) == 18441921395520307713));
3230
assert!(((((*words.borrow()).offset((2) as isize).read()) as i32) == 56780));
3331
assert!(((((*words.borrow()).offset((3) as isize).read()) as i32) == 65518));
3432
return 0;

tests/unit/out/refcount/reinterpret_cast_double.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn main() {
1212
fn main_0() -> i32 {
1313
let d: Value<f64> = Rc::new(RefCell::new(1.0E+0));
1414
let bits: Value<Ptr<u64>> = Rc::new(RefCell::new((d.as_pointer()).reinterpret_cast::<u64>()));
15-
assert!((((*bits.borrow()).read()) == 4607182418800017408_u64));
15+
assert!((((*bits.borrow()).read()) == 4607182418800017408));
1616
(*bits.borrow()).write(4614256656552045848_u64);
1717
assert!(((*d.borrow()) > 3.14E+0) && ((*d.borrow()) < 3.15E+0));
1818
return 0;

0 commit comments

Comments
 (0)