From 34c549d49d85ac947405377cf63d8a3f09f7c73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Tal=C4=8D=C3=ADk?= Date: Mon, 1 Mar 2021 09:41:48 +0100 Subject: [PATCH] spv-in flow: fix loop --- src/front/spv/flow.rs | 16 ++-------------- tests/out/shadow.info.ron.snap | 5 +++-- tests/out/shadow.ron.snap | 5 ----- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/front/spv/flow.rs b/src/front/spv/flow.rs index 7471281ab6..c4b910c8f2 100644 --- a/src/front/spv/flow.rs +++ b/src/front/spv/flow.rs @@ -1,4 +1,4 @@ -#![allow(dead_code)] + #![allow(dead_code)] use super::error::Error; ///! see https://en.wikipedia.org/wiki/Control-flow_graph @@ -394,19 +394,7 @@ impl FlowGraph { }; Ok(result) } - Some(ControlFlowNodeType::Continue) => { - let back_block = match node.terminator { - Terminator::Branch { target_id } => { - self.naga_traverse(self.block_to_node[&target_id], None)? - } - _ => return Err(Error::InvalidTerminator), - }; - - let mut result = node.block.clone(); - result.extend(back_block); - result.push(crate::Statement::Continue); - Ok(result) - } + Some(ControlFlowNodeType::Continue) => Ok(node.block.clone()), Some(ControlFlowNodeType::Back) => Ok(node.block.clone()), Some(ControlFlowNodeType::Kill) => { let mut result = node.block.clone(); diff --git a/tests/out/shadow.info.ron.snap b/tests/out/shadow.info.ron.snap index d0d632509e..1e2dc996e3 100644 --- a/tests/out/shadow.info.ron.snap +++ b/tests/out/shadow.info.ron.snap @@ -1,6 +1,7 @@ --- source: tests/snapshots.rs expression: output + --- ( functions: [ @@ -878,7 +879,7 @@ expression: output control_flags: ( bits: 1, ), - ref_count: 12, + ref_count: 11, assignable_global: None, ), ( @@ -1214,7 +1215,7 @@ expression: output control_flags: ( bits: 1, ), - ref_count: 2, + ref_count: 1, assignable_global: None, ), ( diff --git a/tests/out/shadow.ron.snap b/tests/out/shadow.ron.snap index 3a7d33ffe1..e201326272 100644 --- a/tests/out/shadow.ron.snap +++ b/tests/out/shadow.ron.snap @@ -1107,11 +1107,6 @@ expression: output pointer: 43, value: 91, ), - Store( - pointer: 44, - value: 92, - ), - Continue, ], continuing: [ Store(