[tint] Replace ASSERT_TRUE() in lambda with ADD_FAILURE
ADD_FAILURE does the same thing as ASSERT_TRUE(), except it doesn't emit a return statement, so doesn't need the lamda.
Change-Id: Iaab81a06ca46e0863d860b3e43cedd4585ebc88e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/152800
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/lang/core/type/helper_test.h b/src/tint/lang/core/type/helper_test.h
index 7cb71bc..8731f61 100644
--- a/src/tint/lang/core/type/helper_test.h
+++ b/src/tint/lang/core/type/helper_test.h
@@ -30,9 +30,9 @@
/// Builds and returns the program. Must only be called once per test
/// @return the built program
Program Build() {
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
return resolver::Resolve(*this);
}
};
diff --git a/src/tint/lang/glsl/writer/ast_printer/helper_test.h b/src/tint/lang/glsl/writer/ast_printer/helper_test.h
index e67c334..c245c0b 100644
--- a/src/tint/lang/glsl/writer/ast_printer/helper_test.h
+++ b/src/tint/lang/glsl/writer/ast_printer/helper_test.h
@@ -52,11 +52,13 @@
if (gen_) {
return *gen_;
}
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
program = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
gen_ = std::make_unique<ASTPrinter>(*program, version);
return *gen_;
}
@@ -73,17 +75,18 @@
if (gen_) {
return *gen_;
}
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
program = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
auto sanitized_result = Sanitize(*program, options, /* entry_point */ "");
- [&] {
- ASSERT_TRUE(sanitized_result.program.IsValid())
- << sanitized_result.program.Diagnostics().str();
- }();
+ if (!sanitized_result.program.IsValid()) {
+ ADD_FAILURE() << sanitized_result.program.Diagnostics().str();
+ }
*program = std::move(sanitized_result.program);
gen_ = std::make_unique<ASTPrinter>(*program, version);
diff --git a/src/tint/lang/hlsl/writer/ast_printer/helper_test.h b/src/tint/lang/hlsl/writer/ast_printer/helper_test.h
index 55ab4cc..a503ec7 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/helper_test.h
+++ b/src/tint/lang/hlsl/writer/ast_printer/helper_test.h
@@ -51,11 +51,13 @@
if (gen_) {
return *gen_;
}
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
program = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
gen_ = std::make_unique<ASTPrinter>(*program);
return *gen_;
}
@@ -70,17 +72,18 @@
if (gen_) {
return *gen_;
}
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
program = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
auto sanitized_result = Sanitize(*program, options);
- [&] {
- ASSERT_TRUE(sanitized_result.program.IsValid())
- << sanitized_result.program.Diagnostics().str();
- }();
+ if (!sanitized_result.program.IsValid()) {
+ ADD_FAILURE() << sanitized_result.program.Diagnostics().str();
+ }
ast::transform::Manager transform_manager;
ast::transform::DataMap transform_data;
@@ -90,7 +93,9 @@
/* preserve_unicode */ true);
transform_manager.Add<tint::ast::transform::Renamer>();
auto result = transform_manager.Run(sanitized_result.program, transform_data, outputs);
- [&] { ASSERT_TRUE(result.IsValid()) << result.Diagnostics().str(); }();
+ if (!result.IsValid()) {
+ ADD_FAILURE() << result.Diagnostics().str();
+ }
*program = std::move(result);
gen_ = std::make_unique<ASTPrinter>(*program);
return *gen_;
diff --git a/src/tint/lang/msl/writer/ast_printer/helper_test.h b/src/tint/lang/msl/writer/ast_printer/helper_test.h
index aded390..27bb279 100644
--- a/src/tint/lang/msl/writer/ast_printer/helper_test.h
+++ b/src/tint/lang/msl/writer/ast_printer/helper_test.h
@@ -49,11 +49,13 @@
if (gen_) {
return *gen_;
}
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
program = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
gen_ = std::make_unique<ASTPrinter>(*program);
return *gen_;
}
@@ -68,14 +70,18 @@
if (gen_) {
return *gen_;
}
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
program = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
auto result = Sanitize(*program, options);
- [&] { ASSERT_TRUE(result.program.IsValid()) << result.program.Diagnostics().str(); }();
+ if (!result.program.IsValid()) {
+ ADD_FAILURE() << result.program.Diagnostics().str();
+ }
*program = std::move(result.program);
gen_ = std::make_unique<ASTPrinter>(*program);
return *gen_;
diff --git a/src/tint/lang/spirv/writer/ast_printer/helper_test.h b/src/tint/lang/spirv/writer/ast_printer/helper_test.h
index 4580c28..4e7945ce 100644
--- a/src/tint/lang/spirv/writer/ast_printer/helper_test.h
+++ b/src/tint/lang/spirv/writer/ast_printer/helper_test.h
@@ -53,11 +53,13 @@
if (spirv_builder) {
return *spirv_builder;
}
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
program = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
spirv_builder = std::make_unique<Builder>(*program);
return *spirv_builder;
}
@@ -72,13 +74,17 @@
if (spirv_builder) {
return *spirv_builder;
}
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
program = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
auto result = Sanitize(*program, options);
- [&] { ASSERT_TRUE(result.program.IsValid()) << result.program.Diagnostics().str(); }();
+ if (!result.program.IsValid()) {
+ ADD_FAILURE() << result.program.Diagnostics().str();
+ }
*program = std::move(result.program);
bool zero_initialize_workgroup_memory =
!options.disable_workgroup_init &&
diff --git a/src/tint/lang/wgsl/inspector/inspector_builder_test.cc b/src/tint/lang/wgsl/inspector/inspector_builder_test.cc
index 58f781f..4066063 100644
--- a/src/tint/lang/wgsl/inspector/inspector_builder_test.cc
+++ b/src/tint/lang/wgsl/inspector/inspector_builder_test.cc
@@ -356,7 +356,9 @@
return *inspector_;
}
program_ = std::make_unique<Program>(resolver::Resolve(*this));
- [&] { ASSERT_TRUE(program_->IsValid()) << program_->Diagnostics().str(); }();
+ if (!program_->IsValid()) {
+ ADD_FAILURE() << program_->Diagnostics().str();
+ }
inspector_ = std::make_unique<Inspector>(*program_);
return *inspector_;
}
diff --git a/src/tint/lang/wgsl/inspector/inspector_runner_test.cc b/src/tint/lang/wgsl/inspector/inspector_runner_test.cc
index b249358..b5cbe9a 100644
--- a/src/tint/lang/wgsl/inspector/inspector_runner_test.cc
+++ b/src/tint/lang/wgsl/inspector/inspector_runner_test.cc
@@ -27,7 +27,9 @@
file_ = std::make_unique<Source::File>("test", shader);
program_ = std::make_unique<Program>(wgsl::reader::Parse(file_.get()));
- [&] { ASSERT_TRUE(program_->IsValid()) << program_->Diagnostics().str(); }();
+ if (!program_->IsValid()) {
+ ADD_FAILURE() << program_->Diagnostics();
+ }
inspector_ = std::make_unique<Inspector>(*program_);
return *inspector_;
}
diff --git a/src/tint/lang/wgsl/sem/helper_test.h b/src/tint/lang/wgsl/sem/helper_test.h
index 583cbde..0737060 100644
--- a/src/tint/lang/wgsl/sem/helper_test.h
+++ b/src/tint/lang/wgsl/sem/helper_test.h
@@ -30,9 +30,9 @@
/// Builds and returns the program. Must only be called once per test
/// @return the built program
Program Build() {
- [&] {
- ASSERT_TRUE(IsValid()) << "Builder program is not valid\n" << Diagnostics().str();
- }();
+ if (!IsValid()) {
+ ADD_FAILURE() << "ProgramBuilder is not valid: " << Diagnostics().str();
+ }
return resolver::Resolve(*this);
}
};
diff --git a/src/tint/lang/wgsl/writer/ast_printer/helper_test.h b/src/tint/lang/wgsl/writer/ast_printer/helper_test.h
index 008a38b..14b2ed7 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/helper_test.h
+++ b/src/tint/lang/wgsl/writer/ast_printer/helper_test.h
@@ -47,7 +47,9 @@
} else {
program = std::make_unique<Program>(std::move(*this));
}
- [&] { ASSERT_TRUE(program->IsValid()) << program->Diagnostics().str(); }();
+ if (!program->IsValid()) {
+ ADD_FAILURE() << program->Diagnostics().str();
+ }
gen_ = std::make_unique<ASTPrinter>(*program);
return *gen_;
}
