Skip to content
Merged
Changes from all commits
Commits
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
45 changes: 32 additions & 13 deletions koopa/src/ir/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,15 +307,24 @@ pub trait LocalInstBuilder: ValueBuilder {
let ty = match self.func_type(callee).kind() {
TypeKind::Function(params, ret) => {
assert!(
params
.iter()
.zip(args.iter())
.all(|(ty, a)| ty == &self.value_type(*a)),
"argument type mismatch"
params.len() == args.len(),
"argument count mismatch: expected {} arguments, but got {}",
params.len(),
args.len()
);
for (i, (expected, arg)) in params.iter().zip(args.iter()).enumerate() {
let actual = self.value_type(*arg);
assert!(
expected == &actual,
"argument type mismatch at parameter {}: expected {}, but got {}",
i,
expected,
actual
);
}
ret.clone()
}
_ => panic!("expected a function type"),
t => panic!("expected a function type, but got {}", t),
};
self.insert_value(Call::new_data(callee, args, ty))
}
Expand Down Expand Up @@ -408,13 +417,22 @@ pub trait BasicBlockBuilder: Sized + ValueInserter {
/// match the given argument types.
fn check_bb_arg_types(querier: &impl EntityInfoQuerier, params: &[Value], args: &[Value]) {
assert!(
params.len() == args.len()
&& params
.iter()
.zip(args.iter())
.all(|(p, a)| querier.value_type(*p) == querier.value_type(*a)),
"arguments type of basic block mismatch"
params.len() == args.len(),
"basic block argument count mismatch: expected {} arguments, but got {}",
params.len(),
args.len()
);
for (i, (param, arg)) in params.iter().zip(args.iter()).enumerate() {
let expected = querier.value_type(*param);
let actual = querier.value_type(*arg);
assert!(
expected == actual,
"basic block argument type mismatch at parameter {}: expected {}, but got {}",
i,
expected,
actual
);
}
}

/// Checks if the given name is a valid basic block name.
Expand All @@ -427,7 +445,8 @@ fn check_bb_name(name: &Option<String>) {
name
.as_ref()
.is_none_or(|n| n.len() > 1 && (n.starts_with('%') || n.starts_with('@'))),
"invalid basic block name"
"invalid basic block name: {}, expected a '%' or '@' prefix followed by at least one character",
name.as_deref().unwrap()
);
}

Expand Down
Loading