encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Have Program::IsValid() return false unless built 

An unbuilt program doesn't have an ast::Module, so Program::AST() will just explode.

* Have a Program default to false for IsValid()
* Initialize the ast_ field to nullptr. This was previously floating.
* Return from CommonFuzzer::Run() earlier if the InputFormat is not recognised.

Fixed: chromium:1180130
Fixed: chromium:1180157
Change-Id: I9b67daa10746f386f44919a7b9ac5c171092d6e5
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/42028
Reviewed-by: David Neto <dneto@google.com>
Commit-Queue: David Neto <dneto@google.com>
This commit is contained in:
Ben Clayton 2021-02-19 19:04:18 +00:00 committed by Commit Bot service account
parent 3bb3116bdf
commit 527a0bbf25
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuzzers/tint_common_fuzzer.cc
View File

@ -42,19 +42,17 @@ int CommonFuzzer::Run(const uint8_t* data, size_t size) {
#endif // TINT_BUILD_WGSL_READER #endif // TINT_BUILD_WGSL_READER
switch (input_) { switch (input_) {
case InputFormat::kWGSL:
#if TINT_BUILD_WGSL_READER #if TINT_BUILD_WGSL_READER
{ case InputFormat::kWGSL: {
std::string str(reinterpret_cast<const char*>(data), size); std::string str(reinterpret_cast<const char*>(data), size);
file = std::make_unique<Source::File>("test.wgsl", str); file = std::make_unique<Source::File>("test.wgsl", str);
program = reader::wgsl::Parse(file.get()); program = reader::wgsl::Parse(file.get());
break;
} }
#endif // TINT_BUILD_WGSL_READER #endif // TINT_BUILD_WGSL_READER
break;
case InputFormat::kSpv:
#if TINT_BUILD_SPV_READER #if TINT_BUILD_SPV_READER
{ case InputFormat::kSpv: {
size_t sizeInU32 = size / sizeof(uint32_t); size_t sizeInU32 = size / sizeof(uint32_t);
const uint32_t* u32Data = reinterpret_cast<const uint32_t*>(data); const uint32_t* u32Data = reinterpret_cast<const uint32_t*>(data);
std::vector<uint32_t> input(u32Data, u32Data + sizeInU32); std::vector<uint32_t> input(u32Data, u32Data + sizeInU32);
@ -62,11 +60,11 @@ int CommonFuzzer::Run(const uint8_t* data, size_t size) {
if (input.size() != 0) { if (input.size() != 0) {
program = reader::spirv::Parse(input); program = reader::spirv::Parse(input);
} }
break;
} }
#endif // TINT_BUILD_WGSL_READER #endif // TINT_BUILD_WGSL_READER
break;
default: default:
break; return 0;
} }
if (output_ == OutputFormat::kNone) { if (output_ == OutputFormat::kNone) {

4
src/program.h
View File

@ -160,11 +160,11 @@ class Program {
type::Manager types_; type::Manager types_;
ASTNodeAllocator ast_nodes_; ASTNodeAllocator ast_nodes_;
SemNodeAllocator sem_nodes_; SemNodeAllocator sem_nodes_;
ast::Module* ast_; ast::Module* ast_ = nullptr;
semantic::Info sem_; semantic::Info sem_;
SymbolTable symbols_; SymbolTable symbols_;
diag::List diagnostics_; diag::List diagnostics_;
bool is_valid_ = true; bool is_valid_ = false; // Not valid until it is built
bool moved_ = false; bool moved_ = false;
}; };

5
src/program_test.cc
View File

@ -31,6 +31,11 @@ namespace {
using ProgramTest = ast::TestHelper; using ProgramTest = ast::TestHelper;
TEST_F(ProgramTest, Unbuilt) {
Program program;
EXPECT_FALSE(program.IsValid());
}
TEST_F(ProgramTest, Creation) { TEST_F(ProgramTest, Creation) {
Program program(std::move(*this)); Program program(std::move(*this));
EXPECT_EQ(program.AST().Functions().size(), 0u); EXPECT_EQ(program.AST().Functions().size(), 0u);