Skip to content

Commit 2ce7edd

Browse files
committed
fix: use zip() for safer Option handling in assignment expression CFG
1 parent 481067a commit 2ce7edd

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

crates/oxc_semantic/src/builder.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -975,8 +975,10 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
975975
let expr_end_ix = cfg.current_node_ix;
976976
let after_assignment_ix = cfg.new_basic_block_normal();
977977

978-
if let Some(before_ix) = before_assignment_graph_ix {
979-
cfg.add_edge(before_ix, start_of_condition_graph_ix.unwrap(), EdgeType::Normal);
978+
if let Some((before_ix, condition_ix)) =
979+
before_assignment_graph_ix.zip(start_of_condition_graph_ix)
980+
{
981+
cfg.add_edge(before_ix, condition_ix, EdgeType::Normal);
980982
}
981983
cfg.add_edge(target_end_ix, expr_start_ix, EdgeType::Normal);
982984
cfg.add_edge(target_end_ix, after_assignment_ix, EdgeType::Normal);

0 commit comments

Comments
 (0)