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

tint/resolver: Fix ICE when using template args with builtin enums 

Fixes an 'unreachable AST node' ICE which is otherwise completely harmless.

Bug: chromium:1427389
Change-Id: Id5a75b76ca27e00b9e44336a8dd303abed950333
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/125400
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Ben Clayton 2023-03-24 17:27:42 +00:00 committed by Dawn LUCI CQ
parent 99b8081e31
commit aff2b43596
4 changed files with 190 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tint/BUILD.gn
View File

@ -1411,6 +1411,7 @@ if (tint_build_unittests) {
"resolver/atomics_validation_test.cc",
"resolver/attribute_validation_test.cc",
"resolver/bitcast_validation_test.cc",
"resolver/builtin_enum_test.cc",
"resolver/builtin_test.cc",
"resolver/builtin_validation_test.cc",
"resolver/builtins_validation_test.cc",

1
src/tint/CMakeLists.txt
View File

@ -907,6 +907,7 @@ if(TINT_BUILD_TESTS)
resolver/atomics_validation_test.cc
resolver/attribute_validation_test.cc
resolver/bitcast_validation_test.cc
resolver/builtin_enum_test.cc
resolver/builtin_test.cc
resolver/builtin_validation_test.cc
resolver/builtins_validation_test.cc

164
src/tint/resolver/builtin_enum_test.cc Normal file
View File

@ -0,0 +1,164 @@
// Copyright 2023 The Tint Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "src/tint/builtin/access.h"
#include "src/tint/builtin/address_space.h"
#include "src/tint/builtin/builtin_value.h"
#include "src/tint/builtin/interpolation_sampling.h"
#include "src/tint/builtin/interpolation_type.h"
#include "src/tint/builtin/texel_format.h"
#include "src/tint/resolver/resolver.h"
#include "src/tint/resolver/resolver_test_helper.h"
#include "gmock/gmock.h"
using namespace tint::number_suffixes; // NOLINT
namespace tint::resolver {
namespace {
////////////////////////////////////////////////////////////////////////////////
// access
////////////////////////////////////////////////////////////////////////////////
using ResolverAccessUsedWithTemplateArgs = ResolverTestWithParam<const char*>;
TEST_P(ResolverAccessUsedWithTemplateArgs, Test) {
// @group(0) @binding(0) var t : texture_storage_2d<rgba8unorm, ACCESS<T>>;
auto* tmpl = Ident(Source{{12, 34}}, GetParam(), "T");
GlobalVar("v", ty("texture_storage_2d", "rgba8unorm", tmpl), Group(0_u), Binding(0_u));
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: access '" + std::string(GetParam()) +
"' does not take template arguments");
}
INSTANTIATE_TEST_SUITE_P(,
ResolverAccessUsedWithTemplateArgs,
testing::ValuesIn(builtin::kAccessStrings));
////////////////////////////////////////////////////////////////////////////////
// address space
////////////////////////////////////////////////////////////////////////////////
using ResolverAddressSpaceUsedWithTemplateArgs = ResolverTestWithParam<const char*>;
TEST_P(ResolverAddressSpaceUsedWithTemplateArgs, Test) {
// fn f(p : ptr<ADDRESS_SPACE<T>, f32) {}
Enable(builtin::Extension::kChromiumExperimentalFullPtrParameters);
auto* tmpl = Ident(Source{{12, 34}}, GetParam(), "T");
Func("f", utils::Vector{Param("p", ty("ptr", tmpl, ty.f32()))}, ty.void_(), utils::Empty);
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: address space '" + std::string(GetParam()) +
"' does not take template arguments");
}
INSTANTIATE_TEST_SUITE_P(,
ResolverAddressSpaceUsedWithTemplateArgs,
testing::ValuesIn(builtin::kAddressSpaceStrings));
////////////////////////////////////////////////////////////////////////////////
// builtin value
////////////////////////////////////////////////////////////////////////////////
using ResolverBuiltinValueUsedWithTemplateArgs = ResolverTestWithParam<const char*>;
TEST_P(ResolverBuiltinValueUsedWithTemplateArgs, Test) {
// fn f(@builtin(BUILTIN<T>) p : vec4<f32>) {}
auto* tmpl = Ident(Source{{12, 34}}, GetParam(), "T");
Func("f", utils::Vector{Param("p", ty.vec4<f32>(), utils::Vector{Builtin(tmpl)})}, ty.void_(),
utils::Empty, utils::Vector{Stage(ast::PipelineStage::kFragment)});
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: builtin value '" + std::string(GetParam()) +
"' does not take template arguments");
}
INSTANTIATE_TEST_SUITE_P(,
ResolverBuiltinValueUsedWithTemplateArgs,
testing::ValuesIn(builtin::kBuiltinValueStrings));
////////////////////////////////////////////////////////////////////////////////
// interpolation sampling
////////////////////////////////////////////////////////////////////////////////
using ResolverInterpolationSamplingUsedWithTemplateArgs = ResolverTestWithParam<const char*>;
TEST_P(ResolverInterpolationSamplingUsedWithTemplateArgs, Test) {
// @fragment
// fn f(@location(0) @interpolate(linear, INTERPOLATION_SAMPLING<T>) p : vec4<f32>) {}
auto* tmpl = Ident(Source{{12, 34}}, GetParam(), "T");
Func("f",
utils::Vector{Param("p", ty.vec4<f32>(),
utils::Vector{
Location(0_a),
Interpolate(builtin::InterpolationType::kLinear, tmpl),
})},
ty.void_(), utils::Empty,
utils::Vector{
Stage(ast::PipelineStage::kFragment),
});
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: interpolation sampling '" + std::string(GetParam()) +
"' does not take template arguments");
}
INSTANTIATE_TEST_SUITE_P(,
ResolverInterpolationSamplingUsedWithTemplateArgs,
testing::ValuesIn(builtin::kInterpolationSamplingStrings));
////////////////////////////////////////////////////////////////////////////////
// interpolation type
////////////////////////////////////////////////////////////////////////////////
using ResolverInterpolationTypeUsedWithTemplateArgs = ResolverTestWithParam<const char*>;
TEST_P(ResolverInterpolationTypeUsedWithTemplateArgs, Test) {
// @fragment
// fn f(@location(0) @interpolate(INTERPOLATION_TYPE<T>, center) p : vec4<f32>) {}
auto* tmpl = Ident(Source{{12, 34}}, GetParam(), "T");
Func("f",
utils::Vector{Param("p", ty.vec4<f32>(),
utils::Vector{
Location(0_a),
Interpolate(tmpl, builtin::InterpolationSampling::kCenter),
})},
ty.void_(), utils::Empty,
utils::Vector{
Stage(ast::PipelineStage::kFragment),
});
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: interpolation type '" + std::string(GetParam()) +
"' does not take template arguments");
}
INSTANTIATE_TEST_SUITE_P(,
ResolverInterpolationTypeUsedWithTemplateArgs,
testing::ValuesIn(builtin::kInterpolationTypeStrings));
////////////////////////////////////////////////////////////////////////////////
// texel format
////////////////////////////////////////////////////////////////////////////////
using ResolverTexelFormatUsedWithTemplateArgs = ResolverTestWithParam<const char*>;
TEST_P(ResolverTexelFormatUsedWithTemplateArgs, Test) {
// @group(0) @binding(0) var t : texture_storage_2d<TEXEL_FORMAT<T>, write>
auto* tmpl = Ident(Source{{12, 34}}, GetParam(), "T");
GlobalVar("t", ty("texture_storage_2d", ty(tmpl), "write"), Group(0_u), Binding(0_u));
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), "12:34 error: texel format '" + std::string(GetParam()) +
"' does not take template arguments");
}
INSTANTIATE_TEST_SUITE_P(,
ResolverTexelFormatUsedWithTemplateArgs,
testing::ValuesIn(builtin::kTexelFormatStrings));
} // namespace
} // namespace tint::resolver

36
src/tint/resolver/resolver.cc
View File

@ -3048,35 +3048,47 @@ sem::Expression* Resolver::Identifier(const ast::IdentifierExpression* expr) {
}
if (auto access = resolved->Access(); access != builtin::Access::kUndefined) {
return builder_->create<sem::BuiltinEnumExpression<builtin::Access>>(
expr, current_statement_, access);
return CheckNotTemplated("access", ident)
? builder_->create<sem::BuiltinEnumExpression<builtin::Access>>(
expr, current_statement_, access)
: nullptr;
}
if (auto addr = resolved->AddressSpace(); addr != builtin::AddressSpace::kUndefined) {
return builder_->create<sem::BuiltinEnumExpression<builtin::AddressSpace>>(
expr, current_statement_, addr);
return CheckNotTemplated("address space", ident)
? builder_->create<sem::BuiltinEnumExpression<builtin::AddressSpace>>(
expr, current_statement_, addr)
: nullptr;
}
if (auto builtin = resolved->BuiltinValue(); builtin != builtin::BuiltinValue::kUndefined) {
return builder_->create<sem::BuiltinEnumExpression<builtin::BuiltinValue>>(
expr, current_statement_, builtin);
return CheckNotTemplated("builtin value", ident)
? builder_->create<sem::BuiltinEnumExpression<builtin::BuiltinValue>>(
expr, current_statement_, builtin)
: nullptr;
}
if (auto i_smpl = resolved->InterpolationSampling();
i_smpl != builtin::InterpolationSampling::kUndefined) {
return builder_->create<sem::BuiltinEnumExpression<builtin::InterpolationSampling>>(
expr, current_statement_, i_smpl);
return CheckNotTemplated("interpolation sampling", ident)
? builder_->create<sem::BuiltinEnumExpression<builtin::InterpolationSampling>>(
expr, current_statement_, i_smpl)
: nullptr;
}
if (auto i_type = resolved->InterpolationType();
i_type != builtin::InterpolationType::kUndefined) {
return builder_->create<sem::BuiltinEnumExpression<builtin::InterpolationType>>(
expr, current_statement_, i_type);
return CheckNotTemplated("interpolation type", ident)
? builder_->create<sem::BuiltinEnumExpression<builtin::InterpolationType>>(
expr, current_statement_, i_type)
: nullptr;
}
if (auto fmt = resolved->TexelFormat(); fmt != builtin::TexelFormat::kUndefined) {
return builder_->create<sem::BuiltinEnumExpression<builtin::TexelFormat>>(
expr, current_statement_, fmt);
return CheckNotTemplated("texel format", ident)
? builder_->create<sem::BuiltinEnumExpression<builtin::TexelFormat>>(
expr, current_statement_, fmt)
: nullptr;
}
if (auto* unresolved = resolved->Unresolved()) {