Update spirv-tools to v2021.4 (#4862)

2021-11-16 17:13:42 -08:00
parent a29b438161
commit 9d29d2e32c
529 changed files with 26363 additions and 5855 deletions
--- a/third_party/spirv-tools/source/val/construct.cpp
+++ b/third_party/spirv-tools/source/val/construct.cpp
@@ -181,8 +181,9 @@ bool Construct::IsStructuredExit(ValidationState_t& _, BasicBlock* dest) const {
      for (auto& use : block->label()->uses()) {
        if ((use.first->opcode() == SpvOpLoopMerge ||
             use.first->opcode() == SpvOpSelectionMerge) &&
-            use.second == 1)
+            use.second == 1 && use.first->block()->dominates(*block)) {
          return use.first->block();
+        }
      }
      return block->immediate_dominator();
    };