commit 90d6b2d94fd0f681b56fe8ae67bc0f3a4fceae3e
author David Neto <dneto@google.com> Thu Jun 04 15:26:31 2020 +0000
committer dan sinclair <dsinclair@google.com> Thu Jun 04 15:26:31 2020 +0000
tree 7d540cdc39d4d421c35e03d45f94c673a2eea1c0
parent 7d60a4c544429e45f03a20274ca9f62687d37436

[spirv-reader] Update test to show error is caught

In this example, a branch escapes an if-selection.
This is caught by ClassifyCFGEdges

Bug: tint:3
Change-Id: I5586e8bb5f9de0cdf57ad46708fcee12cd31f6aa
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/22600
Reviewed-by: dan sinclair <dsinclair@google.com>

src/reader/spirv/function_cfg_test.cc

diff --git a/src/reader/spirv/function_cfg_test.cc b/src/reader/spirv/function_cfg_test.cc
index 4a71050..02e4344 100644
--- a/src/reader/spirv/function_cfg_test.cc
+++ b/src/reader/spirv/function_cfg_test.cc
@@ -4152,7 +4152,7 @@
   EXPECT_THAT(*(bi20->case_values.get()), UnorderedElementsAre(200, 300));
 }
 
-TEST_F(SpvParserTest, DISABLED_BranchEscapesIfConstruct) {
+TEST_F(SpvParserTest, ClassifyCFGEdges_BranchEscapesIfConstruct) {
   auto assembly = CommonTypes() + R"(
      %100 = OpFunction %void None %voidfn
 
@@ -4179,14 +4179,9 @@
   auto* p = parser(test::Assemble(assembly));
   ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
   FunctionEmitter fe(p, *spirv_function(100));
-  fe.RegisterBasicBlocks();
-  fe.ComputeBlockOrderAndPositions();
-  EXPECT_TRUE(fe.VerifyHeaderContinueMergeOrder());
-  fe.RegisterMerges();
-  fe.LabelControlFlowConstructs();
-  fe.FindSwitchCaseHeaders();
+  EXPECT_FALSE(FlowClassifyCFGEdges(&fe)) << p->error();
   // Some further processing
-  EXPECT_THAT(p->error(), Eq("something"));
+  EXPECT_THAT(p->error(), Eq("Branch from block 30 to block 80 is an invalid exit from construct starting at block 20; branch bypasses merge block 50"));
 }
 
 TEST_F(SpvParserTest, ClassifyCFGEdges_ReturnInContinueConstruct) {