Commit 6f5c55f
committed
Fix invalid SPIRV from
When a `continue` statement appears inside a `switch` nested within a `for`
loop, the `eliminateMultiLevelBreak` pass failed to detect the branch from
inside the switch to the loop's continue block as a multi-level branch. This
caused the raw IR branch to reach the SPIRV emitter, producing unstructured
control flow that spirv-val rejects.
Root cause: for `for`-loops, the continue block is distinct from the loop's
target block. `populateExitBlocks()` stored `continueBlock` but did not add
it to the region's `exitBlocks` list, so `mapExitBlockToRegion` never mapped
it to the loop region, and `gatherInfo()` never flagged the branch as a
multi-level branch. As a result, `eliminateContinueBlocksInFunc()` was never
triggered to transform the IR into valid SPIRV structured form.
Fix: when `continueBlock != targetBlock`, add `continueBlock` to
`region->exitBlocks` so it participates in multi-level branch detection.
This triggers `eliminateContinueBlocksInFunc()`, which wraps the loop body
in an inner breakable region; the `continue` from inside the switch then
becomes a break from that region — a valid SPIRV structured exit.
Also fix a related leak: after processing a region, pop `continueBlock`
from the global `exitBlocks` stack unconditionally, covering the while-loop
case where `continueBlock == targetBlock` and it was not in `exitBlocks`.
Fixes #9585, #10198.continue inside switch inside for loop1 parent 48d73cd commit 6f5c55f
File tree
3 files changed
+119
-1
lines changed- source/slang
- tests/bugs
3 files changed
+119
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
| 75 | + | |
75 | 76 | | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
76 | 92 | | |
77 | 93 | | |
78 | 94 | | |
| |||
180 | 196 | | |
181 | 197 | | |
182 | 198 | | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
183 | 203 | | |
184 | 204 | | |
185 | 205 | | |
| |||
Lines changed: 52 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
0 commit comments