mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 23:11:01 +01:00
[naga] Allow unreachable statements (#7718)
Allow unreachable statements after return/break/continue/discard. Fixes #7536
This commit is contained in:
1 parent
38e667efa5
commit
f34dfd90e0
4 files changed
+33
-45
No files matched your search
@@ -114,8 +114,6 @@ pub enum FunctionError {
|
||||
name: String,
|
||||
space: crate::AddressSpace,
|
||||
},
|
||||
#[error("There are instructions after `return`/`break`/`continue`")]
|
||||
InstructionsAfterReturn,
|
||||
#[error("The `break` is used outside of a `loop` or `switch` context")]
|
||||
BreakOutsideOfLoopOrSwitch,
|
||||
#[error("The `continue` is used outside of a `loop` context")]
|
||||
@@ -236,7 +234,6 @@ bitflags::bitflags! {
|
||||
|
||||
struct BlockInfo {
|
||||
stages: super::ShaderStages,
|
||||
finished: bool,
|
||||
}
|
||||
|
||||
struct BlockContext<'a> {
|
||||
@@ -768,13 +765,8 @@ impl super::Validator {
|
||||
context: &BlockContext,
|
||||
) -> Result<BlockInfo, WithSpan<FunctionError>> {
|
||||
use crate::{AddressSpace, Statement as S, TypeInner as Ti};
|
||||
let mut finished = false;
|
||||
let mut stages = super::ShaderStages::all();
|
||||
for (statement, &span) in statements.span_iter() {
|
||||
if finished {
|
||||
return Err(FunctionError::InstructionsAfterReturn
|
||||
.with_span_static(span, "instructions after return"));
|
||||
}
|
||||
match *statement {
|
||||
S::Emit(ref range) => {
|
||||
for handle in range.clone() {
|
||||
@@ -823,7 +815,6 @@ impl super::Validator {
|
||||
S::Block(ref block) => {
|
||||
let info = self.validate_block(block, context)?;
|
||||
stages &= info.stages;
|
||||
finished = info.finished;
|
||||
}
|
||||
S::If {
|
||||
condition,
|
||||
@@ -966,14 +957,12 @@ impl super::Validator {
|
||||
return Err(FunctionError::BreakOutsideOfLoopOrSwitch
|
||||
.with_span_static(span, "invalid break"));
|
||||
}
|
||||
finished = true;
|
||||
}
|
||||
S::Continue => {
|
||||
if !context.abilities.contains(ControlFlowAbility::CONTINUE) {
|
||||
return Err(FunctionError::ContinueOutsideOfLoop
|
||||
.with_span_static(span, "invalid continue"));
|
||||
}
|
||||
finished = true;
|
||||
}
|
||||
S::Return { value } => {
|
||||
if !context.abilities.contains(ControlFlowAbility::RETURN) {
|
||||
@@ -1013,11 +1002,9 @@ impl super::Validator {
|
||||
.with_span_static(span, "invalid return"));
|
||||
}
|
||||
}
|
||||
finished = true;
|
||||
}
|
||||
S::Kill => {
|
||||
stages &= super::ShaderStages::FRAGMENT;
|
||||
finished = true;
|
||||
}
|
||||
S::Barrier(barrier) => {
|
||||
stages &= super::ShaderStages::COMPUTE;
|
||||
@@ -1635,7 +1622,7 @@ impl super::Validator {
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(BlockInfo { stages, finished })
|
||||
Ok(BlockInfo { stages })
|
||||
}
|
||||
|
||||
fn validate_block(
|
||||
|
||||
Reference in new issue
Block a user