commit 0ce9ab042ef5896b57833dd73dfa19fc94973b13
author Ben Clayton <bclayton@google.com> Thu May 05 20:23:40 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 05 20:23:40 2022 +0000
tree 0be26ce7b6969f887c975f52b639ff8b331d871d
parent 8b9d1e080077d50d165e9af821c2e2346884c657

tint: Change all ProgramBuilder literals to 'i' or 'u' suffix

Unsuffixed integer literals are currently treated as i32,
but will shortly become AbstractInteger. To keep tests behaving
identically to how they are currently, change all test literals
to using either 'i' or 'u' suffixes.

Bug: tint:1504
Change-Id: Ic373d18ce1c718a16b6905568aec89da3641d36b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88845
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/tint/transform/calculate_array_length.cc

diff --git a/src/tint/transform/calculate_array_length.cc b/src/tint/transform/calculate_array_length.cc
index c2128c7..42a212c 100644
--- a/src/tint/transform/calculate_array_length.cc
+++ b/src/tint/transform/calculate_array_length.cc
@@ -33,6 +33,8 @@
 TINT_INSTANTIATE_TYPEINFO(tint::transform::CalculateArrayLength);
 TINT_INSTANTIATE_TYPEINFO(tint::transform::CalculateArrayLength::BufferSizeIntrinsic);
 
+using namespace tint::number_suffixes;  // NOLINT
+
 namespace tint::transform {
 
 namespace {
@@ -168,7 +170,7 @@
                             // RWByteAddressBuffer.GetDimensions()
                             auto* buffer_size_result = ctx.dst->Decl(
                                 ctx.dst->Var(ctx.dst->Sym(), ctx.dst->ty.u32(),
-                                             ast::StorageClass::kNone, ctx.dst->Expr(0u)));
+                                             ast::StorageClass::kNone, ctx.dst->Expr(0_u)));
 
                             // Call storage_buffer.GetDimensions(&buffer_size_result)
                             auto* call_get_dims = ctx.dst->CallStmt(ctx.dst->Call(
@@ -192,7 +194,8 @@
                                 // the array member.
                                 auto* array_member_sem = str->Members().back();
                                 array_type = array_member_sem->Type()->As<sem::Array>();
-                                total_size = ctx.dst->Sub(total_size, array_member_sem->Offset());
+                                total_size =
+                                    ctx.dst->Sub(total_size, u32(array_member_sem->Offset()));
                             } else if (auto* arr = storage_buffer_type->As<sem::Array>()) {
                                 array_type = arr;
                             } else {
@@ -202,8 +205,9 @@
                                 return name;
                             }
                             uint32_t array_stride = array_type->Size();
-                            auto* array_length_var = ctx.dst->Decl(ctx.dst->Let(
-                                name, ctx.dst->ty.u32(), ctx.dst->Div(total_size, array_stride)));
+                            auto* array_length_var = ctx.dst->Decl(
+                                ctx.dst->Let(name, ctx.dst->ty.u32(),
+                                             ctx.dst->Div(total_size, u32(array_stride))));
 
                             // Insert the array length calculations at the top of the block
                             ctx.InsertBefore(block->statements, block->statements[0],