Skip to content

fix(chisel): correct dynamic type detection and .length semantics #12589

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −8
Open

fix(chisel): correct dynamic type detection and .length semantics #12589

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
33 changes: 25 additions & 8 deletions crates/chisel/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ impl Type {
// Array / bytes members
let ty = Self::Builtin(ty);
match access.as_str() {
"length" if ty.is_dynamic() || ty.is_array() || ty.is_fixed_bytes() => {
"length" if ty.is_dynamic() || ty.is_array() => {
return Self::Builtin(DynSolType::Uint(256));
}
"pop" if ty.is_dynamic_array() => return ty,
Expand Down Expand Up @@ -1090,10 +1090,31 @@ impl Type {
#[inline]
fn is_dynamic(&self) -> bool {
match self {
// TODO: Note, this is not entirely correct. Fixed arrays of non-dynamic types are
// not dynamic, nor are tuples of non-dynamic types.
Self::Builtin(DynSolType::Bytes | DynSolType::String | DynSolType::Array(_)) => true,
// Builtin types: recurse through tuples and fixed arrays to detect any dynamic member
Self::Builtin(ty) => {
let mut stack: Vec<&DynSolType> = vec![ty];
while let Some(t) = stack.pop() {
match t {
DynSolType::Bytes | DynSolType::String | DynSolType::Array(_) => {
return true;
}
DynSolType::FixedArray(inner, _) => stack.push(inner),
DynSolType::Tuple(types) => {
for tt in types {
stack.push(tt);
}
}
_ => {}
}
}
false
}
// Dynamic arrays are always dynamic
Self::Array(_) => true,
// Fixed arrays are dynamic only if their element type is dynamic
Self::FixedArray(inner, _) => inner.is_dynamic(),
// Tuples are dynamic if any component is dynamic
Self::Tuple(types) => types.iter().filter_map(|t| t.as_ref()).any(|t| t.is_dynamic()),
_ => false,
}
}
Expand All @@ -1115,10 +1136,6 @@ impl Type {
fn is_dynamic_array(&self) -> bool {
matches!(self, Self::Array(_) | Self::Builtin(DynSolType::Array(_)))
}

fn is_fixed_bytes(&self) -> bool {
matches!(self, Self::Builtin(DynSolType::FixedBytes(_)))
}
}

/// Returns Some if the custom type is a function member access
Expand Down
Loading