Skip to content

fix(ir/validator): fix crash + typos in validator.rs #104

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
Dhakshin2007 wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

fix(ir/validator): fix crash + typos in validator.rs #104

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
10 changes: 5 additions & 5 deletions src/compiler/translator/ir/src/validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// - If conditions are boolean: validate_if_condition_is_bool()

// TODO(http://anglebug.com/349994211): to validate:
// - Referenced IDs are not dead-code-eliminated: Checking against max_*_count can be paird with a
// - Referenced IDs are not dead-code-eliminated: Checking against max_*_count can be paired with a
// look up and checking that !is_dead_code_eliminated
// - If there's a cached "has side effect", that it's correct.
// - No operations should have entirely constant arguments, that should be folded (and
Expand Down Expand Up @@ -408,7 +408,7 @@ impl<'a> Validator<'a> {
for variable in &block.variables {
if variable.id >= self.max_variable_count {
self.on_error(format_args!(
"invalid variable id {} found in block variabls",
"invalid variable id {} found in block variables",
variable.id
));
}
Expand Down Expand Up @@ -1286,7 +1286,7 @@ impl<'a> Validator<'a> {
if current_block.case_blocks.is_empty() {
self.on_error(format_args!(
"OpCode::Switch is missing a valid target. Current block should contain \
at lease 1 case_block"
at least 1 case_block"
));
}
if current_block.merge_block.is_none() {
Expand Down Expand Up @@ -1452,7 +1452,7 @@ impl<'a> Validator<'a> {
}

fn validate_no_branch_in_the_middle_of_block_instructions(&self, block: &Block) {
for instruction in &block.instructions[0..block.instructions.len() - 1] {
for instruction in &block.instructions[0..block.instructions.len().saturating_sub(1)] {
if instruction.is_branch() {
self.on_error(format_args!(
"branch instruction is only allowed in the last instruction in the block"
Expand Down Expand Up @@ -1566,7 +1566,7 @@ impl<'a> Validator<'a> {
if condition.type_id != TYPE_ID_BOOL =>
{
self.on_error(format_args!(
"invalid If/LoopIf instruction: {:?}, consition is not a boolean: {:?}",
"invalid If/LoopIf instruction: {:?}, condition is not a boolean: {:?}",
opcode, condition.type_id
));
}
Expand Down