encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-16 00:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

tint/PromoteInitializers: Do not hoist abstracts

Browse Source 
Hoisting them would cause premature materialization. This will only
happen in cases where we do not actually need to hoist (e.g. assigning
to a phony), so we can safely skip these.

Fixed: tint:1852
Change-Id: Ifcbe3e13496daa0a6aaceb58540e60cb037885ea
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/122104
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
This commit is contained in:
James Price
2023-03-01 00:20:49 +00:00
committed by Dawn LUCI CQ
parent dee884c925
commit d623182c33
10 changed files with 84 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tint/transform/promote_initializers_to_let.cc
View File

@@ -52,6 +52,11 @@ Transform::ApplyResult PromoteInitializersToLet::Apply(const Program* src,
// Follow const-chains
auto* root_expr = expr;
if (expr->Stage() == sem::EvaluationStage::kConstant) {
if (expr->Type()->HoldsAbstract()) {
// Do not hoist expressions that are not materialized, as doing so would cause
// premature materialization.
return false;
}
while (auto* user = root_expr->UnwrapMaterialize()->As<sem::VariableUser>()) {
root_expr = user->Variable()->Initializer();
}

12
src/tint/transform/promote_initializers_to_let_test.cc
View File

@@ -1335,5 +1335,17 @@ fn f() {
EXPECT_EQ(expect, str(got));
}
TEST_F(PromoteInitializersToLetTest, AssignAbstractArray_ToPhony) {
// Test that we do not try to hoist an abstract array expression that is the RHS of a phony
// assignment, as its type will not be materialized.
auto* src = R"(
fn f() {
_ = array(1, 2, 3, 4);
}
)";
EXPECT_FALSE(ShouldRun<PromoteInitializersToLet>(src));
}
} // namespace
} // namespace tint::transform

20
src/tint/transform/utils/hoist_to_decl_before.cc
View File

@@ -44,10 +44,11 @@ struct HoistToDeclBefore::State {
switch (kind) {
case VariableKind::kLet: {
auto builder = [this, expr, name] {
return b.Decl(b.Let(
name, Transform::CreateASTTypeFor(ctx, ctx.src->Sem().GetVal(expr)->Type()),
ctx.CloneWithoutTransform(expr)));
auto* ty = ctx.src->Sem().GetVal(expr)->Type();
TINT_ASSERT(Transform, !ty->HoldsAbstract());
auto builder = [this, expr, name, ty] {
return b.Decl(b.Let(name, Transform::CreateASTTypeFor(ctx, ty),
ctx.CloneWithoutTransform(expr)));
};
if (!InsertBeforeImpl(before_expr->Stmt(), std::move(builder))) {
return false;
@@ -56,10 +57,11 @@ struct HoistToDeclBefore::State {
}
case VariableKind::kVar: {
auto builder = [this, expr, name] {
return b.Decl(b.Var(
name, Transform::CreateASTTypeFor(ctx, ctx.src->Sem().GetVal(expr)->Type()),
ctx.CloneWithoutTransform(expr)));
auto* ty = ctx.src->Sem().GetVal(expr)->Type();
TINT_ASSERT(Transform, !ty->HoldsAbstract());
auto builder = [this, expr, name, ty] {
return b.Decl(b.Var(name, Transform::CreateASTTypeFor(ctx, ty),
ctx.CloneWithoutTransform(expr)));
};
if (!InsertBeforeImpl(before_expr->Stmt(), std::move(builder))) {
return false;
@@ -78,7 +80,7 @@ struct HoistToDeclBefore::State {
}
}
// Replace the initializer expression with a reference to the let
// Replace the source expression with a reference to the hoisted declaration.
ctx.Replace(expr, b.Expr(name));
return true;
}