ast: Remove ReturnStatement constructors that don't take a source
set_source() will be removed, so sources will only be specifiable at construction time.
Bug: tint:390
Change-Id: I2b81929e362ccf75145ebc45028dd973a77ae068
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35010
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/src/ast/return_statement.cc b/src/ast/return_statement.cc
index 43a2ac5..3583138 100644
--- a/src/ast/return_statement.cc
+++ b/src/ast/return_statement.cc
@@ -22,12 +22,8 @@
namespace tint {
namespace ast {
-ReturnStatement::ReturnStatement() : Base() {}
-
ReturnStatement::ReturnStatement(const Source& source) : Base(source) {}
-ReturnStatement::ReturnStatement(Expression* value) : Base(), value_(value) {}
-
ReturnStatement::ReturnStatement(const Source& source, Expression* value)
: Base(source), value_(value) {}
diff --git a/src/ast/return_statement.h b/src/ast/return_statement.h
index c90079b..547411a 100644
--- a/src/ast/return_statement.h
+++ b/src/ast/return_statement.h
@@ -28,14 +28,9 @@
class ReturnStatement : public Castable<ReturnStatement, Statement> {
public:
/// Constructor
- ReturnStatement();
- /// Constructor
/// @param source the source information
explicit ReturnStatement(const Source& source);
/// Constructor
- /// @param value the return value
- explicit ReturnStatement(Expression* value);
- /// Constructor
/// @param source the return statement source
/// @param value the return value
ReturnStatement(const Source& source, Expression* value);
diff --git a/src/ast/return_statement_test.cc b/src/ast/return_statement_test.cc
index 384b49e..8e9e525 100644
--- a/src/ast/return_statement_test.cc
+++ b/src/ast/return_statement_test.cc
@@ -28,7 +28,7 @@
TEST_F(ReturnStatementTest, Creation) {
auto* expr = create<IdentifierExpression>("expr");
- ReturnStatement r(expr);
+ ReturnStatement r(Source{}, expr);
EXPECT_EQ(r.value(), expr);
}
@@ -40,41 +40,41 @@
}
TEST_F(ReturnStatementTest, IsReturn) {
- ReturnStatement r;
+ ReturnStatement r(Source{});
EXPECT_TRUE(r.Is<ReturnStatement>());
}
TEST_F(ReturnStatementTest, HasValue_WithoutValue) {
- ReturnStatement r;
+ ReturnStatement r(Source{});
EXPECT_FALSE(r.has_value());
}
TEST_F(ReturnStatementTest, HasValue_WithValue) {
auto* expr = create<IdentifierExpression>("expr");
- ReturnStatement r(expr);
+ ReturnStatement r(Source{}, expr);
EXPECT_TRUE(r.has_value());
}
TEST_F(ReturnStatementTest, IsValid_WithoutValue) {
- ReturnStatement r;
+ ReturnStatement r(Source{});
EXPECT_TRUE(r.IsValid());
}
TEST_F(ReturnStatementTest, IsValid_WithValue) {
auto* expr = create<IdentifierExpression>("expr");
- ReturnStatement r(expr);
+ ReturnStatement r(Source{}, expr);
EXPECT_TRUE(r.IsValid());
}
TEST_F(ReturnStatementTest, IsValid_InvalidValue) {
auto* expr = create<IdentifierExpression>("");
- ReturnStatement r(expr);
+ ReturnStatement r(Source{}, expr);
EXPECT_FALSE(r.IsValid());
}
TEST_F(ReturnStatementTest, ToStr_WithValue) {
auto* expr = create<IdentifierExpression>("expr");
- ReturnStatement r(expr);
+ ReturnStatement r(Source{}, expr);
std::ostringstream out;
r.to_str(out, 2);
EXPECT_EQ(out.str(), R"( Return{
@@ -86,7 +86,7 @@
}
TEST_F(ReturnStatementTest, ToStr_WithoutValue) {
- ReturnStatement r;
+ ReturnStatement r(Source{});
std::ostringstream out;
r.to_str(out, 2);
EXPECT_EQ(out.str(), R"( Return{}
diff --git a/src/inspector/inspector_test.cc b/src/inspector/inspector_test.cc
index 9cddc87..9439593 100644
--- a/src/inspector/inspector_test.cc
+++ b/src/inspector/inspector_test.cc
@@ -82,7 +82,7 @@
std::string name,
ast::FunctionDecorationList decorations = {}) {
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
return create<ast::Function>(Source{}, name, ast::VariableList(),
void_type(), body, decorations);
}
@@ -101,7 +101,7 @@
auto* call_expr =
create<ast::CallExpression>(ident_expr, ast::ExpressionList());
body->append(create<ast::CallStatement>(call_expr));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
return create<ast::Function>(Source{}, caller, ast::VariableList(),
void_type(), body, decorations);
}
@@ -141,7 +141,7 @@
create<ast::IdentifierExpression>(out),
create<ast::IdentifierExpression>(in)));
}
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
return create<ast::Function>(Source{}, name, ast::VariableList(),
void_type(), body, decorations);
}
@@ -171,7 +171,7 @@
auto* call_expr =
create<ast::CallExpression>(ident_expr, ast::ExpressionList());
body->append(create<ast::CallStatement>(call_expr));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
return create<ast::Function>(Source{}, caller, ast::VariableList(),
void_type(), body, decorations);
}
@@ -416,7 +416,7 @@
create<ast::IdentifierExpression>(member_name))));
}
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
return create<ast::Function>(Source{}, func_name, ast::VariableList(),
void_type(), body,
ast::FunctionDecorationList{});
@@ -540,7 +540,7 @@
body->append(create<ast::AssignmentStatement>(
create<ast::IdentifierExpression>("sampler_result"), call_expr));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
return create<ast::Function>(Source{}, func_name, ast::VariableList(),
void_type(), body, decorations);
@@ -582,7 +582,7 @@
body->append(create<ast::AssignmentStatement>(
create<ast::IdentifierExpression>("sampler_result"), call_expr));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
return create<ast::Function>(Source{}, func_name, ast::VariableList(),
void_type(), body, decorations);
@@ -624,7 +624,7 @@
body->append(create<ast::AssignmentStatement>(
create<ast::IdentifierExpression>("sampler_result"), call_expr));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
return create<ast::Function>(Source{}, func_name, ast::VariableList(),
void_type(), body, decorations);
@@ -1455,7 +1455,7 @@
AddFuncCall(body, "ub_bar_func");
AddFuncCall(body, "ub_baz_func");
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::Function* func = create<ast::Function>(
Source{}, "ep_func", ast::VariableList(), void_type(), body,
ast::FunctionDecorationList{
@@ -1601,7 +1601,7 @@
AddFuncCall(body, "sb_bar_func");
AddFuncCall(body, "sb_baz_func");
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::Function* func = create<ast::Function>(
Source{}, "ep_func", ast::VariableList(), void_type(), body,
ast::FunctionDecorationList{
@@ -1774,7 +1774,7 @@
AddFuncCall(body, "sb_bar_func");
AddFuncCall(body, "sb_baz_func");
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::Function* func = create<ast::Function>(
Source{}, "ep_func", ast::VariableList(), void_type(), body,
ast::FunctionDecorationList{
diff --git a/src/reader/spirv/function.cc b/src/reader/spirv/function.cc
index 03be176..a2d90f7 100644
--- a/src/reader/spirv/function.cc
+++ b/src/reader/spirv/function.cc
@@ -2374,11 +2374,11 @@
const auto& terminator = *(block_info.basic_block->terminator());
switch (terminator.opcode()) {
case SpvOpReturn:
- AddStatement(create<ast::ReturnStatement>());
+ AddStatement(create<ast::ReturnStatement>(Source{}));
return true;
case SpvOpReturnValue: {
auto value = MakeExpression(terminator.GetSingleWordInOperand(0));
- AddStatement(create<ast::ReturnStatement>(value.expr));
+ AddStatement(create<ast::ReturnStatement>(Source{}, value.expr));
}
return true;
case SpvOpKill:
@@ -2392,11 +2392,11 @@
{
const auto* result_type = type_mgr_->GetType(function_.type_id());
if (result_type->AsVoid() != nullptr) {
- AddStatement(create<ast::ReturnStatement>());
+ AddStatement(create<ast::ReturnStatement>(Source{}));
} else {
auto* ast_type = parser_impl_.ConvertType(function_.type_id());
AddStatement(create<ast::ReturnStatement>(
- parser_impl_.MakeNullValue(ast_type)));
+ Source{}, parser_impl_.MakeNullValue(ast_type)));
}
}
return true;
diff --git a/src/type_determiner_test.cc b/src/type_determiner_test.cc
index f9a21ad..a761335 100644
--- a/src/type_determiner_test.cc
+++ b/src/type_determiner_test.cc
@@ -291,7 +291,7 @@
auto* cond = create<ast::ScalarConstructorExpression>(
create<ast::SintLiteral>(&i32, 2));
- ast::ReturnStatement ret(cond);
+ ast::ReturnStatement ret(Source{}, cond);
EXPECT_TRUE(td()->DetermineResultType(&ret));
ASSERT_NE(cond->result_type(), nullptr);
@@ -300,7 +300,7 @@
TEST_F(TypeDeterminerTest, Stmt_Return_WithoutValue) {
ast::type::I32 i32;
- ast::ReturnStatement ret;
+ ast::ReturnStatement ret(Source{});
EXPECT_TRUE(td()->DetermineResultType(&ret));
}
@@ -370,14 +370,14 @@
ast::VariableList params0;
auto* main_body = create<ast::BlockStatement>();
main_body->append(create<ast::CallStatement>(call_expr));
- main_body->append(create<ast::ReturnStatement>());
+ main_body->append(create<ast::ReturnStatement>(Source{}));
auto* func_main =
create<ast::Function>(Source{}, "main", params0, &f32, main_body,
ast::FunctionDecorationList{});
mod->AddFunction(func_main);
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(Source{}, "func", params0, &f32, body,
ast::FunctionDecorationList{});
mod->AddFunction(func);
diff --git a/src/validator/validator_function_test.cc b/src/validator/validator_function_test.cc
index 4911941..2327220 100644
--- a/src/validator/validator_function_test.cc
+++ b/src/validator/validator_function_test.cc
@@ -124,7 +124,7 @@
ast::VariableList params;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "func", params, &void_type, body,
ast::FunctionDecorationList{
@@ -193,7 +193,7 @@
auto* return_expr = create<ast::ScalarConstructorExpression>(
create<ast::SintLiteral>(&i32, 2));
- body->append(create<ast::ReturnStatement>(return_expr));
+ body->append(create<ast::ReturnStatement>(Source{}, return_expr));
auto* func = create<ast::Function>(Source{}, "func", params, &i32, body,
ast::FunctionDecorationList{});
@@ -202,7 +202,7 @@
auto* return_expr_copy = create<ast::ScalarConstructorExpression>(
create<ast::SintLiteral>(&i32, 2));
- body_copy->append(create<ast::ReturnStatement>(return_expr_copy));
+ body_copy->append(create<ast::ReturnStatement>(Source{}, return_expr_copy));
auto* func_copy = create<ast::Function>(Source{Source::Location{12, 34}},
"func", params_copy, &i32, body_copy,
ast::FunctionDecorationList{});
@@ -226,7 +226,7 @@
ast::VariableList params0;
auto* body0 = create<ast::BlockStatement>();
body0->append(create<ast::CallStatement>(call_expr));
- body0->append(create<ast::ReturnStatement>());
+ body0->append(create<ast::ReturnStatement>(Source{}));
auto* func0 = create<ast::Function>(Source{}, "func", params0, &f32, body0,
ast::FunctionDecorationList{});
mod()->AddFunction(func0);
@@ -252,7 +252,7 @@
auto* return_expr = create<ast::ScalarConstructorExpression>(
create<ast::SintLiteral>(&i32, 2));
- body0->append(create<ast::ReturnStatement>(return_expr));
+ body0->append(create<ast::ReturnStatement>(Source{}, return_expr));
auto* func0 = create<ast::Function>(Source{}, "func", params0, &i32, body0,
ast::FunctionDecorationList{});
mod()->AddFunction(func0);
@@ -271,7 +271,7 @@
create<ast::SintLiteral>(&i32, 0));
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>(return_expr));
+ body->append(create<ast::ReturnStatement>(Source{}, return_expr));
auto* func = create<ast::Function>(
Source{Source::Location{12, 34}}, "vtx_main", params, &i32, body,
ast::FunctionDecorationList{
@@ -294,7 +294,7 @@
params.push_back(
create<ast::Variable>(Source{}, "a", ast::StorageClass::kNone, &i32));
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{Source::Location{12, 34}}, "vtx_func", params, &void_type, body,
ast::FunctionDecorationList{
@@ -316,7 +316,7 @@
ast::type::Void void_type;
ast::VariableList params;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{Source::Location{12, 34}}, "main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -338,7 +338,7 @@
ast::type::Void void_type;
ast::VariableList params;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "vtx_func", params, &void_type, body,
ast::FunctionDecorationList{
@@ -355,7 +355,7 @@
ast::type::Void void_type;
ast::VariableList params;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(Source{}, "vtx_func", params, &void_type,
body, ast::FunctionDecorationList{});
mod()->AddFunction(func);
diff --git a/src/validator/validator_test.cc b/src/validator/validator_test.cc
index 49a8d2f..8c95501 100644
--- a/src/validator/validator_test.cc
+++ b/src/validator/validator_test.cc
@@ -326,7 +326,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::AssignmentStatement>(
Source{Source::Location{12, 34}}, lhs, rhs));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "my_func", params, &void_type, body,
ast::FunctionDecorationList{
@@ -634,7 +634,7 @@
auto* body0 = create<ast::BlockStatement>();
body0->append(create<ast::VariableDeclStatement>(
Source{Source::Location{12, 34}}, var0));
- body0->append(create<ast::ReturnStatement>());
+ body0->append(create<ast::ReturnStatement>(Source{}));
auto* func0 = create<ast::Function>(Source{}, "func0", params0, &void_type,
body0, ast::FunctionDecorationList{});
@@ -642,7 +642,7 @@
auto* body1 = create<ast::BlockStatement>();
body1->append(create<ast::VariableDeclStatement>(
Source{Source::Location{13, 34}}, var1));
- body1->append(create<ast::ReturnStatement>());
+ body1->append(create<ast::ReturnStatement>(Source{}));
auto* func1 = create<ast::Function>(
Source{}, "func1", params1, &void_type, body1,
ast::FunctionDecorationList{
diff --git a/src/writer/hlsl/generator_impl_binary_test.cc b/src/writer/hlsl/generator_impl_binary_test.cc
index 4dd592f..1a7310a 100644
--- a/src/writer/hlsl/generator_impl_binary_test.cc
+++ b/src/writer/hlsl/generator_impl_binary_test.cc
@@ -378,15 +378,15 @@
ast::type::I32 i32;
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::ScalarConstructorExpression>(
- create<ast::SintLiteral>(&i32, 3))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::ScalarConstructorExpression>(
+ create<ast::SintLiteral>(&i32, 3))));
auto* else_stmt = create<ast::ElseStatement>(body);
body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::ScalarConstructorExpression>(
- create<ast::SintLiteral>(&i32, 2))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::ScalarConstructorExpression>(
+ create<ast::SintLiteral>(&i32, 2))));
auto* else_if_stmt = create<ast::ElseStatement>(
create<ast::BinaryExpression>(ast::BinaryOp::kLogicalOr,
create<ast::IdentifierExpression>("b"),
@@ -394,9 +394,9 @@
body);
body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::ScalarConstructorExpression>(
- create<ast::SintLiteral>(&i32, 1))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::ScalarConstructorExpression>(
+ create<ast::SintLiteral>(&i32, 1))));
ast::IfStatement expr(
Source{},
@@ -436,9 +436,11 @@
auto* b = create<ast::IdentifierExpression>("b");
auto* c = create<ast::IdentifierExpression>("c");
- ast::ReturnStatement expr(create<ast::BinaryExpression>(
- ast::BinaryOp::kLogicalOr,
- create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, a, b), c));
+ ast::ReturnStatement expr(
+ Source{},
+ create<ast::BinaryExpression>(
+ ast::BinaryOp::kLogicalOr,
+ create<ast::BinaryExpression>(ast::BinaryOp::kLogicalAnd, a, b), c));
ASSERT_TRUE(gen.EmitStatement(out, &expr)) << gen.error();
EXPECT_EQ(result(), R"(bool _tint_tmp = a;
diff --git a/src/writer/hlsl/generator_impl_function_test.cc b/src/writer/hlsl/generator_impl_function_test.cc
index 2f107ef..315394c 100644
--- a/src/writer/hlsl/generator_impl_function_test.cc
+++ b/src/writer/hlsl/generator_impl_function_test.cc
@@ -57,7 +57,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "my_func", ast::VariableList{},
&void_type, body, ast::FunctionDecorationList{});
@@ -77,7 +77,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "GeometryShader", ast::VariableList{},
&void_type, body, ast::FunctionDecorationList{});
@@ -106,7 +106,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(Source{}, "my_func", params, &void_type,
body, ast::FunctionDecorationList{});
@@ -145,7 +145,7 @@
body->append(create<ast::AssignmentStatement>(
create<ast::IdentifierExpression>("bar"),
create<ast::IdentifierExpression>("foo")));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -203,7 +203,7 @@
create<ast::MemberAccessorExpression>(
create<ast::IdentifierExpression>("coord"),
create<ast::IdentifierExpression>("x"))));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -257,7 +257,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -318,7 +318,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -383,7 +383,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -444,7 +444,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -507,7 +507,7 @@
auto* body = create<ast::BlockStatement>();
body->append(assign);
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -565,8 +565,8 @@
body->append(create<ast::AssignmentStatement>(
create<ast::IdentifierExpression>("val"),
create<ast::IdentifierExpression>("param")));
- body->append(
- create<ast::ReturnStatement>(create<ast::IdentifierExpression>("foo")));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::IdentifierExpression>("foo")));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -581,7 +581,7 @@
create<ast::IdentifierExpression>("bar"),
create<ast::CallExpression>(create<ast::IdentifierExpression>("sub_func"),
expr)));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func_1 = create<ast::Function>(
Source{}, "ep_1", params, &void_type, body,
ast::FunctionDecorationList{
@@ -639,8 +639,8 @@
ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::IdentifierExpression>("param")));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::IdentifierExpression>("param")));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -655,7 +655,7 @@
create<ast::IdentifierExpression>("depth"),
create<ast::CallExpression>(create<ast::IdentifierExpression>("sub_func"),
expr)));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func_1 = create<ast::Function>(
Source{}, "ep_1", params, &void_type, body,
ast::FunctionDecorationList{
@@ -716,8 +716,8 @@
create<ast::MemberAccessorExpression>(
create<ast::IdentifierExpression>("coord"),
create<ast::IdentifierExpression>("x"))));
- body->append(
- create<ast::ReturnStatement>(create<ast::IdentifierExpression>("param")));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::IdentifierExpression>("param")));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -732,7 +732,7 @@
create<ast::IdentifierExpression>("depth"),
create<ast::CallExpression>(create<ast::IdentifierExpression>("sub_func"),
expr)));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func_1 = create<ast::Function>(
Source{}, "ep_1", params, &void_type, body,
ast::FunctionDecorationList{
@@ -788,10 +788,10 @@
ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::MemberAccessorExpression>(
- create<ast::IdentifierExpression>("coord"),
- create<ast::IdentifierExpression>("x"))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::MemberAccessorExpression>(
+ create<ast::IdentifierExpression>("coord"),
+ create<ast::IdentifierExpression>("x"))));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -808,7 +808,7 @@
body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -858,10 +858,10 @@
ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::MemberAccessorExpression>(
- create<ast::IdentifierExpression>("coord"),
- create<ast::IdentifierExpression>("x"))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::MemberAccessorExpression>(
+ create<ast::IdentifierExpression>("coord"),
+ create<ast::IdentifierExpression>("x"))));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -878,7 +878,7 @@
body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -926,7 +926,7 @@
create<ast::FloatLiteral>(&f32, 1.0f))));
auto* list = create<ast::BlockStatement>();
- list->append(create<ast::ReturnStatement>());
+ list->append(create<ast::ReturnStatement>(Source{}));
body->append(create<ast::IfStatement>(
Source{},
@@ -937,7 +937,7 @@
create<ast::SintLiteral>(&i32, 1))),
list, ast::ElseStatementList{}));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func_1 = create<ast::Function>(
Source{}, "ep_1", params, &void_type, body,
ast::FunctionDecorationList{
@@ -990,7 +990,7 @@
ast::VariableList params;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -1015,7 +1015,7 @@
ast::VariableList params;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "main", params, &void_type, body,
ast::FunctionDecorationList{
@@ -1046,7 +1046,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(Source{}, "my_func", params, &void_type,
body, ast::FunctionDecorationList{});
@@ -1117,7 +1117,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "a", params, &void_type, body,
ast::FunctionDecorationList{
@@ -1138,7 +1138,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "b", params, &void_type, body,
ast::FunctionDecorationList{
diff --git a/src/writer/hlsl/generator_impl_if_test.cc b/src/writer/hlsl/generator_impl_if_test.cc
index 0ce0fed..c599362 100644
--- a/src/writer/hlsl/generator_impl_if_test.cc
+++ b/src/writer/hlsl/generator_impl_if_test.cc
@@ -29,7 +29,7 @@
TEST_F(HlslGeneratorImplTest_If, Emit_If) {
auto* cond = create<ast::IdentifierExpression>("cond");
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement i(Source{}, cond, body, ast::ElseStatementList{});
gen.increment_indent();
@@ -44,11 +44,11 @@
TEST_F(HlslGeneratorImplTest_If, Emit_IfWithElseIf) {
auto* else_cond = create<ast::IdentifierExpression>("else_cond");
auto* else_body = create<ast::BlockStatement>();
- else_body->append(create<ast::ReturnStatement>());
+ else_body->append(create<ast::ReturnStatement>(Source{}));
auto* cond = create<ast::IdentifierExpression>("cond");
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement i(Source{}, cond, body,
{create<ast::ElseStatement>(else_cond, else_body)});
@@ -68,11 +68,11 @@
TEST_F(HlslGeneratorImplTest_If, Emit_IfWithElse) {
auto* else_body = create<ast::BlockStatement>();
- else_body->append(create<ast::ReturnStatement>());
+ else_body->append(create<ast::ReturnStatement>(Source{}));
auto* cond = create<ast::IdentifierExpression>("cond");
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement i(Source{}, cond, body,
{create<ast::ElseStatement>(else_body)});
@@ -92,14 +92,14 @@
auto* else_cond = create<ast::IdentifierExpression>("else_cond");
auto* else_body = create<ast::BlockStatement>();
- else_body->append(create<ast::ReturnStatement>());
+ else_body->append(create<ast::ReturnStatement>(Source{}));
auto* else_body_2 = create<ast::BlockStatement>();
- else_body_2->append(create<ast::ReturnStatement>());
+ else_body_2->append(create<ast::ReturnStatement>(Source{}));
auto* cond = create<ast::IdentifierExpression>("cond");
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement i(Source{}, cond, body,
{
diff --git a/src/writer/hlsl/generator_impl_loop_test.cc b/src/writer/hlsl/generator_impl_loop_test.cc
index 00dec1f..d79af0a 100644
--- a/src/writer/hlsl/generator_impl_loop_test.cc
+++ b/src/writer/hlsl/generator_impl_loop_test.cc
@@ -52,7 +52,7 @@
body->append(create<ast::DiscardStatement>());
auto* continuing = create<ast::BlockStatement>();
- continuing->append(create<ast::ReturnStatement>());
+ continuing->append(create<ast::ReturnStatement>(Source{}));
ast::LoopStatement l(body, continuing);
gen.increment_indent();
@@ -79,7 +79,7 @@
body->append(create<ast::DiscardStatement>());
auto* continuing = create<ast::BlockStatement>();
- continuing->append(create<ast::ReturnStatement>());
+ continuing->append(create<ast::ReturnStatement>(Source{}));
auto* inner = create<ast::LoopStatement>(body, continuing);
diff --git a/src/writer/hlsl/generator_impl_return_test.cc b/src/writer/hlsl/generator_impl_return_test.cc
index 4744be8..d2a6ad6 100644
--- a/src/writer/hlsl/generator_impl_return_test.cc
+++ b/src/writer/hlsl/generator_impl_return_test.cc
@@ -28,7 +28,7 @@
using HlslGeneratorImplTest_Return = TestHelper;
TEST_F(HlslGeneratorImplTest_Return, Emit_Return) {
- ast::ReturnStatement r;
+ ast::ReturnStatement r(Source{});
gen.increment_indent();
ASSERT_TRUE(gen.EmitStatement(out, &r)) << gen.error();
@@ -37,7 +37,7 @@
TEST_F(HlslGeneratorImplTest_Return, Emit_ReturnWithValue) {
auto* expr = create<ast::IdentifierExpression>("expr");
- ast::ReturnStatement r(expr);
+ ast::ReturnStatement r(Source{}, expr);
gen.increment_indent();
ASSERT_TRUE(gen.EmitStatement(out, &r)) << gen.error();
diff --git a/src/writer/msl/generator_impl_function_test.cc b/src/writer/msl/generator_impl_function_test.cc
index 22eb889..5290a23 100644
--- a/src/writer/msl/generator_impl_function_test.cc
+++ b/src/writer/msl/generator_impl_function_test.cc
@@ -60,7 +60,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "my_func", ast::VariableList{},
&void_type, body, ast::FunctionDecorationList{});
@@ -82,7 +82,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "main", ast::VariableList{}, &void_type,
body, ast::FunctionDecorationList{});
@@ -113,7 +113,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(Source{}, "my_func", params, &void_type,
body, ast::FunctionDecorationList{});
@@ -153,7 +153,7 @@
body->append(create<ast::AssignmentStatement>(
create<ast::IdentifierExpression>("bar"),
create<ast::IdentifierExpression>("foo")));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
@@ -213,7 +213,7 @@
create<ast::MemberAccessorExpression>(
create<ast::IdentifierExpression>("coord"),
create<ast::IdentifierExpression>("x"))));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
@@ -267,7 +267,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
@@ -333,7 +333,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
@@ -404,7 +404,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
@@ -469,8 +469,8 @@
body->append(create<ast::AssignmentStatement>(
create<ast::IdentifierExpression>("val"),
create<ast::IdentifierExpression>("param")));
- body->append(
- create<ast::ReturnStatement>(create<ast::IdentifierExpression>("foo")));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::IdentifierExpression>("foo")));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -485,7 +485,7 @@
create<ast::IdentifierExpression>("bar"),
create<ast::CallExpression>(create<ast::IdentifierExpression>("sub_func"),
expr)));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func_1 = create<ast::Function>(
Source{}, "ep_1", params, &void_type, body,
ast::FunctionDecorationList{
@@ -546,8 +546,8 @@
ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::IdentifierExpression>("param")));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::IdentifierExpression>("param")));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -562,7 +562,7 @@
create<ast::IdentifierExpression>("depth"),
create<ast::CallExpression>(create<ast::IdentifierExpression>("sub_func"),
expr)));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func_1 = create<ast::Function>(
Source{}, "ep_1", params, &void_type, body,
@@ -627,8 +627,8 @@
create<ast::MemberAccessorExpression>(
create<ast::IdentifierExpression>("coord"),
create<ast::IdentifierExpression>("x"))));
- body->append(
- create<ast::ReturnStatement>(create<ast::IdentifierExpression>("param")));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::IdentifierExpression>("param")));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -643,7 +643,7 @@
create<ast::IdentifierExpression>("depth"),
create<ast::CallExpression>(create<ast::IdentifierExpression>("sub_func"),
expr)));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func_1 = create<ast::Function>(
Source{}, "ep_1", params, &void_type, body,
ast::FunctionDecorationList{
@@ -697,10 +697,10 @@
ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::MemberAccessorExpression>(
- create<ast::IdentifierExpression>("coord"),
- create<ast::IdentifierExpression>("x"))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::MemberAccessorExpression>(
+ create<ast::IdentifierExpression>("coord"),
+ create<ast::IdentifierExpression>("x"))));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -717,7 +717,7 @@
body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
@@ -781,10 +781,10 @@
ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::MemberAccessorExpression>(
- create<ast::IdentifierExpression>("coord"),
- create<ast::IdentifierExpression>("b"))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::MemberAccessorExpression>(
+ create<ast::IdentifierExpression>("coord"),
+ create<ast::IdentifierExpression>("b"))));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -801,7 +801,7 @@
body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
@@ -871,10 +871,10 @@
ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::MemberAccessorExpression>(
- create<ast::IdentifierExpression>("coord"),
- create<ast::IdentifierExpression>("b"))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::MemberAccessorExpression>(
+ create<ast::IdentifierExpression>("coord"),
+ create<ast::IdentifierExpression>("b"))));
auto* sub_func = create<ast::Function>(Source{}, "sub_func", params, &f32,
body, ast::FunctionDecorationList{});
@@ -891,7 +891,7 @@
body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(
Source{}, "frag_main", params, &void_type, body,
@@ -946,7 +946,7 @@
create<ast::FloatLiteral>(&f32, 1.0f))));
auto* list = create<ast::BlockStatement>();
- list->append(create<ast::ReturnStatement>());
+ list->append(create<ast::ReturnStatement>(Source{}));
body->append(create<ast::IfStatement>(
Source{},
@@ -957,7 +957,7 @@
create<ast::SintLiteral>(&i32, 1))),
list, ast::ElseStatementList{}));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func_1 = create<ast::Function>(
Source{}, "ep_1", params, &void_type, body,
@@ -1020,7 +1020,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func = create<ast::Function>(Source{}, "my_func", params, &void_type,
body, ast::FunctionDecorationList{});
@@ -1095,7 +1095,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "a", params, &void_type, body,
@@ -1117,7 +1117,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "b", params, &void_type, body,
diff --git a/src/writer/msl/generator_impl_if_test.cc b/src/writer/msl/generator_impl_if_test.cc
index dd34be7..3a86c4d 100644
--- a/src/writer/msl/generator_impl_if_test.cc
+++ b/src/writer/msl/generator_impl_if_test.cc
@@ -31,7 +31,7 @@
TEST_F(MslGeneratorImplTest, Emit_If) {
auto* cond = create<ast::IdentifierExpression>("cond");
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement i(Source{}, cond, body, ast::ElseStatementList{});
@@ -47,11 +47,11 @@
TEST_F(MslGeneratorImplTest, Emit_IfWithElseIf) {
auto* else_cond = create<ast::IdentifierExpression>("else_cond");
auto* else_body = create<ast::BlockStatement>();
- else_body->append(create<ast::ReturnStatement>());
+ else_body->append(create<ast::ReturnStatement>(Source{}));
auto* cond = create<ast::IdentifierExpression>("cond");
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement i(Source{}, cond, body,
{create<ast::ElseStatement>(else_cond, else_body)});
@@ -69,11 +69,11 @@
TEST_F(MslGeneratorImplTest, Emit_IfWithElse) {
auto* else_body = create<ast::BlockStatement>();
- else_body->append(create<ast::ReturnStatement>());
+ else_body->append(create<ast::ReturnStatement>(Source{}));
auto* cond = create<ast::IdentifierExpression>("cond");
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement i(Source{}, cond, body,
{create<ast::ElseStatement>(else_body)});
@@ -93,14 +93,14 @@
auto* else_cond = create<ast::IdentifierExpression>("else_cond");
auto* else_body = create<ast::BlockStatement>();
- else_body->append(create<ast::ReturnStatement>());
+ else_body->append(create<ast::ReturnStatement>(Source{}));
auto* else_body_2 = create<ast::BlockStatement>();
- else_body_2->append(create<ast::ReturnStatement>());
+ else_body_2->append(create<ast::ReturnStatement>(Source{}));
auto* cond = create<ast::IdentifierExpression>("cond");
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement i(Source{}, cond, body,
{
diff --git a/src/writer/msl/generator_impl_loop_test.cc b/src/writer/msl/generator_impl_loop_test.cc
index c4ef258..bd05c99 100644
--- a/src/writer/msl/generator_impl_loop_test.cc
+++ b/src/writer/msl/generator_impl_loop_test.cc
@@ -55,7 +55,7 @@
body->append(create<ast::DiscardStatement>());
auto* continuing = create<ast::BlockStatement>();
- continuing->append(create<ast::ReturnStatement>());
+ continuing->append(create<ast::ReturnStatement>(Source{}));
ast::LoopStatement l(body, continuing);
@@ -83,7 +83,7 @@
body->append(create<ast::DiscardStatement>());
auto* continuing = create<ast::BlockStatement>();
- continuing->append(create<ast::ReturnStatement>());
+ continuing->append(create<ast::ReturnStatement>(Source{}));
auto* inner = create<ast::LoopStatement>(body, continuing);
diff --git a/src/writer/msl/generator_impl_return_test.cc b/src/writer/msl/generator_impl_return_test.cc
index 408a51c..be2138e 100644
--- a/src/writer/msl/generator_impl_return_test.cc
+++ b/src/writer/msl/generator_impl_return_test.cc
@@ -30,7 +30,7 @@
using MslGeneratorImplTest = TestHelper;
TEST_F(MslGeneratorImplTest, Emit_Return) {
- ast::ReturnStatement r;
+ ast::ReturnStatement r(Source{});
gen.increment_indent();
@@ -40,7 +40,7 @@
TEST_F(MslGeneratorImplTest, Emit_ReturnWithValue) {
auto* expr = create<ast::IdentifierExpression>("expr");
- ast::ReturnStatement r(expr);
+ ast::ReturnStatement r(Source{}, expr);
gen.increment_indent();
diff --git a/src/writer/spirv/builder_call_test.cc b/src/writer/spirv/builder_call_test.cc
index fff29bf..fb83808 100644
--- a/src/writer/spirv/builder_call_test.cc
+++ b/src/writer/spirv/builder_call_test.cc
@@ -49,9 +49,10 @@
create<ast::Variable>(Source{}, "b", ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>(create<ast::BinaryExpression>(
- ast::BinaryOp::kAdd, create<ast::IdentifierExpression>("a"),
- create<ast::IdentifierExpression>("b"))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::BinaryExpression>(
+ ast::BinaryOp::kAdd, create<ast::IdentifierExpression>("a"),
+ create<ast::IdentifierExpression>("b"))));
ast::Function a_func(Source{}, "a_func", func_params, &f32, body,
ast::FunctionDecorationList{});
@@ -113,9 +114,10 @@
create<ast::Variable>(Source{}, "b", ast::StorageClass::kFunction, &f32));
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>(create<ast::BinaryExpression>(
- ast::BinaryOp::kAdd, create<ast::IdentifierExpression>("a"),
- create<ast::IdentifierExpression>("b"))));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::BinaryExpression>(
+ ast::BinaryOp::kAdd, create<ast::IdentifierExpression>("a"),
+ create<ast::IdentifierExpression>("b"))));
ast::Function a_func(Source{}, "a_func", func_params, &void_type, body,
ast::FunctionDecorationList{});
diff --git a/src/writer/spirv/builder_function_test.cc b/src/writer/spirv/builder_function_test.cc
index 82de2af..659f3ea 100644
--- a/src/writer/spirv/builder_function_test.cc
+++ b/src/writer/spirv/builder_function_test.cc
@@ -67,7 +67,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::Function func(Source{}, "a_func", {}, &void_type, body,
ast::FunctionDecorationList{});
@@ -92,8 +92,8 @@
td.RegisterVariableForTesting(var_a);
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::IdentifierExpression>("a")));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::IdentifierExpression>("a")));
ASSERT_TRUE(td.DetermineResultType(body)) << td.error();
ast::Function func(Source{}, "a_func", {}, &void_type, body,
@@ -153,8 +153,8 @@
params.push_back(var_b);
auto* body = create<ast::BlockStatement>();
- body->append(
- create<ast::ReturnStatement>(create<ast::IdentifierExpression>("a")));
+ body->append(create<ast::ReturnStatement>(
+ Source{}, create<ast::IdentifierExpression>("a")));
ast::Function func(Source{}, "a_func", params, &f32, body,
ast::FunctionDecorationList{});
@@ -182,7 +182,7 @@
ast::type::Void void_type;
auto* body = create<ast::BlockStatement>();
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::Function func(Source{}, "a_func", {}, &void_type, body,
ast::FunctionDecorationList{});
@@ -282,7 +282,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "a", params, &void_type, body,
@@ -304,7 +304,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "b", params, &void_type, body,
diff --git a/src/writer/spirv/builder_if_test.cc b/src/writer/spirv/builder_if_test.cc
index 4ad6d01..565860f 100644
--- a/src/writer/spirv/builder_if_test.cc
+++ b/src/writer/spirv/builder_if_test.cc
@@ -549,7 +549,7 @@
create<ast::BoolLiteral>(&bool_type, true));
auto* if_body = create<ast::BlockStatement>();
- if_body->append(create<ast::ReturnStatement>());
+ if_body->append(create<ast::ReturnStatement>(Source{}));
ast::IfStatement expr(Source{}, cond, if_body, ast::ElseStatementList{});
@@ -581,7 +581,7 @@
create<ast::BoolLiteral>(&bool_type, false));
auto* if_body = create<ast::BlockStatement>();
- if_body->append(create<ast::ReturnStatement>(cond2));
+ if_body->append(create<ast::ReturnStatement>(Source{}, cond2));
ast::IfStatement expr(Source{}, cond, if_body, ast::ElseStatementList{});
diff --git a/src/writer/spirv/builder_return_test.cc b/src/writer/spirv/builder_return_test.cc
index db18f85..91f1656 100644
--- a/src/writer/spirv/builder_return_test.cc
+++ b/src/writer/spirv/builder_return_test.cc
@@ -35,7 +35,7 @@
using BuilderTest = TestHelper;
TEST_F(BuilderTest, Return) {
- ast::ReturnStatement ret;
+ ast::ReturnStatement ret(Source{});
b.push_function(Function{});
EXPECT_TRUE(b.GenerateReturnStatement(&ret));
@@ -59,7 +59,7 @@
auto* val = create<ast::TypeConstructorExpression>(&vec, vals);
- ast::ReturnStatement ret(val);
+ ast::ReturnStatement ret(Source{}, val);
EXPECT_TRUE(td.DetermineResultType(&ret)) << td.error();
@@ -83,7 +83,8 @@
ast::Variable var(Source{}, "param", ast::StorageClass::kFunction, &f32);
- ast::ReturnStatement ret(create<ast::IdentifierExpression>("param"));
+ ast::ReturnStatement ret(Source{},
+ create<ast::IdentifierExpression>("param"));
td.RegisterVariableForTesting(&var);
EXPECT_TRUE(td.DetermineResultType(&ret)) << td.error();
diff --git a/src/writer/wgsl/generator_impl_function_test.cc b/src/writer/wgsl/generator_impl_function_test.cc
index f93836d..cbc0192 100644
--- a/src/writer/wgsl/generator_impl_function_test.cc
+++ b/src/writer/wgsl/generator_impl_function_test.cc
@@ -44,7 +44,7 @@
TEST_F(WgslGeneratorImplTest, Emit_Function) {
auto* body = create<ast::BlockStatement>();
body->append(create<ast::DiscardStatement>());
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::type::Void void_type;
ast::Function func(Source{}, "my_func", {}, &void_type, body,
@@ -63,7 +63,7 @@
TEST_F(WgslGeneratorImplTest, Emit_Function_WithParams) {
auto* body = create<ast::BlockStatement>();
body->append(create<ast::DiscardStatement>());
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::type::F32 f32;
ast::type::I32 i32;
@@ -90,7 +90,7 @@
TEST_F(WgslGeneratorImplTest, Emit_Function_WithDecoration_WorkgroupSize) {
auto* body = create<ast::BlockStatement>();
body->append(create<ast::DiscardStatement>());
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::type::Void void_type;
ast::Function func(Source{}, "my_func", {}, &void_type, body,
@@ -112,7 +112,7 @@
TEST_F(WgslGeneratorImplTest, Emit_Function_WithDecoration_Stage) {
auto* body = create<ast::BlockStatement>();
body->append(create<ast::DiscardStatement>());
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::type::Void void_type;
ast::Function func(
@@ -135,7 +135,7 @@
TEST_F(WgslGeneratorImplTest, Emit_Function_WithDecoration_Multiple) {
auto* body = create<ast::BlockStatement>();
body->append(create<ast::DiscardStatement>());
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
ast::type::Void void_type;
ast::Function func(
@@ -214,7 +214,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "a", params, &void_type, body,
@@ -236,7 +236,7 @@
auto* body = create<ast::BlockStatement>();
body->append(create<ast::VariableDeclStatement>(var));
- body->append(create<ast::ReturnStatement>());
+ body->append(create<ast::ReturnStatement>(Source{}));
auto* func =
create<ast::Function>(Source{}, "b", params, &void_type, body,
diff --git a/src/writer/wgsl/generator_impl_return_test.cc b/src/writer/wgsl/generator_impl_return_test.cc
index 51b1e78..12703a7 100644
--- a/src/writer/wgsl/generator_impl_return_test.cc
+++ b/src/writer/wgsl/generator_impl_return_test.cc
@@ -29,7 +29,7 @@
using WgslGeneratorImplTest = TestHelper;
TEST_F(WgslGeneratorImplTest, Emit_Return) {
- ast::ReturnStatement r;
+ ast::ReturnStatement r(Source{});
gen.increment_indent();
@@ -39,7 +39,7 @@
TEST_F(WgslGeneratorImplTest, Emit_ReturnWithValue) {
auto* expr = create<ast::IdentifierExpression>("expr");
- ast::ReturnStatement r(expr);
+ ast::ReturnStatement r(Source{}, expr);
gen.increment_indent();
