From fa7d4d8b51d4eeffe9f648d285466637f733a4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Tal=C4=8D=C3=ADk?= Date: Sat, 20 Feb 2021 14:57:31 +0100 Subject: [PATCH] spv-in: fix if condition when merge node == false node format --- src/front/spv/flow.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/front/spv/flow.rs b/src/front/spv/flow.rs index 9a6c113665..f187464848 100644 --- a/src/front/spv/flow.rs +++ b/src/front/spv/flow.rs @@ -250,7 +250,6 @@ impl FlowGraph { accept: self.naga_traverse(true_node_index, Some(merge_node_index))?, reject: self.naga_traverse(false_node_index, Some(merge_node_index))?, }); - result.extend(self.naga_traverse(merge_node_index, stop_node_index)?); } else { result.push(crate::Statement::If { condition, @@ -258,10 +257,12 @@ impl FlowGraph { self.block_to_node[&true_id], Some(merge_node_index), )?, - reject: self.naga_traverse(merge_node_index, stop_node_index)?, + reject: vec![], }); } + result.extend(self.naga_traverse(merge_node_index, stop_node_index)?); + Ok(result) } Terminator::Switch {