commit f46acc5b7e8d6a899952e636be4c778b3f1b7675
author Ben Clayton <bclayton@google.com> Tue May 21 20:18:17 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 21 20:18:17 2024 +0000
tree 906409b38ffe96f34d6924a8f1331bdbbe622908
parent b9b436e7392dd77a27727bd2e65e752db751e8dd

[tint][ir] Move terminator validation to CheckTerminator()

Instead of doing another dynamic cast in BeginBlock().
Also clean up the diagnostic message.

Change-Id: I561ddab62214be5db24c7148fe57418ac77c1ba2
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/188980
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>

src/tint/lang/core/ir/validator.cc

diff --git a/src/tint/lang/core/ir/validator.cc b/src/tint/lang/core/ir/validator.cc
index 1d69625..504d50e 100644
--- a/src/tint/lang/core/ir/validator.cc
+++ b/src/tint/lang/core/ir/validator.cc
@@ -716,11 +716,6 @@
         if (inst->Block() != blk) {
             AddError(inst) << "block instruction does not have same block as parent";
             AddNote(blk) << "in block";
-            continue;
-        }
-        if (inst->Is<ir::Terminator>() && inst != blk->Terminator()) {
-            AddError(inst) << "block terminator which isn't the final instruction";
-            continue;
         }
     }
 
@@ -1173,6 +1168,10 @@
         [&](const ir::TerminateInvocation*) {},                      //
         [&](const ir::Unreachable*) {},                              //
         [&](Default) { AddError(b) << "missing validation"; });
+
+    if (b->next) {
+        AddError(b) << "must be the last instruction in the block";
+    }
 }
 
 void Validator::CheckContinue(const Continue* c) {