Fixup merge conflict.

Change-Id: I4f04677b1c9a4a29157d2940352042802ef88979
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/19960
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
dan sinclair 2020-04-20 15:21:21 +00:00 committed by David Neto
parent 50714622b4
commit d4d87edc85
1 changed files with 9 additions and 6 deletions

View File

@ -40,10 +40,11 @@ TEST_F(BuilderTest, Loop_Empty) {
ast::LoopStatement expr;
Context ctx;
TypeDeterminer td(&ctx);
ast::Module mod;
TypeDeterminer td(&ctx, &mod);
ASSERT_TRUE(td.DetermineResultType(&expr)) << td.error();
Builder b;
Builder b(&mod);
b.push_function(Function{});
EXPECT_TRUE(b.GenerateLoopStatement(&expr)) << b.error();
@ -79,11 +80,12 @@ TEST_F(BuilderTest, Loop_WithoutContinuing) {
ast::LoopStatement expr(std::move(body), std::move(continuing));
Context ctx;
TypeDeterminer td(&ctx);
ast::Module mod;
TypeDeterminer td(&ctx, &mod);
td.RegisterVariableForTesting(var.get());
ASSERT_TRUE(td.DetermineResultType(&expr)) << td.error();
Builder b;
Builder b(&mod);
b.push_function(Function{});
ASSERT_TRUE(b.GenerateGlobalVariable(var.get())) << b.error();
@ -133,11 +135,12 @@ TEST_F(BuilderTest, Loop_WithContinuing) {
ast::LoopStatement expr(std::move(body), std::move(continuing));
Context ctx;
TypeDeterminer td(&ctx);
ast::Module mod;
TypeDeterminer td(&ctx, &mod);
td.RegisterVariableForTesting(var.get());
ASSERT_TRUE(td.DetermineResultType(&expr)) << td.error();
Builder b;
Builder b(&mod);
b.push_function(Function{});
ASSERT_TRUE(b.GenerateGlobalVariable(var.get())) << b.error();