Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix panics caused by shifting(#1618) #1627

Merged
merged 1 commit into from
Mar 2, 2024
Merged

Fix panics caused by shifting(#1618) #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/sema/expression/arithmetic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,19 @@ pub(super) fn shift_left(
let (right_length, _) = type_bits_and_sign(&right.ty(), &r.loc(), false, ns, diagnostics)?;

let left_type = left.ty().deref_any().clone();
let right_type = right.ty().deref_any().clone();

Ok(Expression::ShiftLeft {
loc: *loc,
ty: left_type.clone(),
left: Box::new(left.cast(loc, &left_type, true, ns, diagnostics)?),
right: Box::new(cast_shift_arg(loc, right, right_length, &left_type, ns)),
right: Box::new(cast_shift_arg(
loc,
right.cast(loc, &right_type, true, ns, diagnostics)?,
right_length,
&left_type,
ns,
)),
})
}

Expand All @@ -252,6 +259,7 @@ pub(super) fn shift_right(
check_var_usage_expression(ns, &left, &right, symtable);

let left_type = left.ty().deref_any().clone();
let right_type = right.ty().deref_any().clone();
// left hand side may be bytes/int/uint
// right hand size may be int/uint
let _ = type_bits_and_sign(&left_type, &l.loc(), true, ns, diagnostics)?;
Expand All @@ -261,7 +269,13 @@ pub(super) fn shift_right(
loc: *loc,
ty: left_type.clone(),
left: Box::new(left.cast(loc, &left_type, true, ns, diagnostics)?),
right: Box::new(cast_shift_arg(loc, right, right_length, &left_type, ns)),
right: Box::new(cast_shift_arg(
loc,
right.cast(loc, &right_type, true, ns, diagnostics)?,
right_length,
&left_type,
ns,
)),
sign: left_type.is_signed_int(ns),
})
}
Expand Down
29 changes: 29 additions & 0 deletions tests/codegen_testcases/solidity/struct_member_shift.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// RUN: --target polkadot --emit cfg
contract c {
struct S {
uint256 a;
}
function test1(S memory s) public pure returns (uint256) {
// CHECK: ty:uint256 %b = (uint256 2 << (load (struct (arg #0) field 0)))
uint256 b = 2 << s.a;
return b;
}

function test2(S memory s) public pure returns (uint256) {
// CHECK: ty:uint256 %b = ((load (struct (arg #0) field 0)) << uint256 2)
uint256 b = s.a << 2;
return b;
}

function test3(S memory s) public pure returns (uint256) {
// CHECK: ty:uint256 %b = (uint256 2 >> (load (struct (arg #0) field 0)))
uint256 b = 2 >> s.a;
return b;
}

function test4(S memory s) public pure returns (uint256) {
// CHECK: ty:uint256 %b = ((load (struct (arg #0) field 0)) >> uint256 2)
uint256 b = s.a >> 2;
return b;
}
}
Loading