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

reader/wgsl: Fix parsing of stride on return type 

Split out the stride decoration and pass it to type_decl() so that it
attaches to the type node instead of the function.

Fixed: tint:781
Change-Id: I8c238d69bd3238047016b5b0a2108273fb9f32ae
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/56680
Kokoro: Kokoro <noreply+kokoro@google.com>
Auto-Submit: James Price <jrprice@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
James Price 2021-07-05 15:56:32 +00:00
parent 537ed0bbd5
commit f83e406b37
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/reader/wgsl/parser_impl.cc
View File

@ -1392,9 +1392,19 @@ Maybe<ParserImpl::FunctionHeader> ParserImpl::function_header() {
}
return_decorations = decos.value;
// Apply stride decorations to the type node instead of the function.
ast::DecorationList type_decorations;
auto itr = std::find_if(
return_decorations.begin(), return_decorations.end(),
[](auto* deco) { return Is<ast::StrideDecoration>(deco); });
if (itr != return_decorations.end()) {
type_decorations.emplace_back(*itr);
return_decorations.erase(itr);
}
auto tok = peek();
auto type = type_decl();
auto type = type_decl(type_decorations);
if (type.errored) {
errored = true;
} else if (!type.matched) {
@ -3147,23 +3157,6 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
return Failure::kNoMatch;
}
template <typename T>
std::vector<T*> ParserImpl::take_decorations(ast::DecorationList& in) {
ast::DecorationList remaining;
std::vector<T*> out;
out.reserve(in.size());
for (auto* deco : in) {
if (auto* t = deco->As<T>()) {
out.emplace_back(t);
} else {
remaining.emplace_back(deco);
}
}
in = std::move(remaining);
return out;
}
bool ParserImpl::expect_decorations_consumed(const ast::DecorationList& in) {
if (in.empty()) {
return true;

5
src/reader/wgsl/parser_impl.h
View File

@ -839,11 +839,6 @@ class ParserImpl {
template <typename F, typename T = ReturnType<F>>
T without_error(F&& func);
/// Returns all the decorations taken from `list` that matches the type `T`.
/// Those that do not match are kept in `list`.
template <typename T>
std::vector<T*> take_decorations(ast::DecorationList& list);
/// Reports an error if the decoration list `list` is not empty.
/// Used to ensure that all decorations are consumed.
bool expect_decorations_consumed(const ast::DecorationList& list);

21
src/reader/wgsl/parser_impl_function_header_test.cc
View File

@ -61,6 +61,27 @@ TEST_F(ParserImplTest, FunctionHeader_DecoratedReturnType) {
EXPECT_EQ(loc->value(), 1u);
}
TEST_F(ParserImplTest, FunctionHeader_DecoratedReturnType_WithArrayStride) {
auto p = parser("fn main() -> [[location(1), stride(16)]] array<f32, 4>");
auto f = p->function_header();
ASSERT_FALSE(p->has_error()) << p->error();
EXPECT_TRUE(f.matched);
EXPECT_FALSE(f.errored);
EXPECT_EQ(f->name, "main");
EXPECT_EQ(f->params.size(), 0u);
ASSERT_EQ(f->return_type_decorations.size(), 1u);
auto* loc = f->return_type_decorations[0]->As<ast::LocationDecoration>();
ASSERT_TRUE(loc != nullptr);
EXPECT_EQ(loc->value(), 1u);
auto* array_type = f->return_type->As<ast::Array>();
ASSERT_EQ(array_type->decorations().size(), 1u);
auto* stride = array_type->decorations()[0]->As<ast::StrideDecoration>();
ASSERT_TRUE(stride != nullptr);
EXPECT_EQ(stride->stride(), 16u);
}
TEST_F(ParserImplTest, FunctionHeader_MissingIdent) {
auto p = parser("fn ()");
auto f = p->function_header();