commit 3f5fde9ee538e0d573eeb2b6591edb7703ec2b0c
author Ryan Harrison <rharrison@chromium.org> Tue Mar 25 21:09:47 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 25 21:09:47 2025 -0700
tree bbd54dff8e8d17e7bb33b7701c3c8101bf874b5d
parent cece62ce780ad431850187587cc3b2bfff6a58e2

[tint] Use std::array to remove unsafe buffer usage warnings

Bug: 394825124
Change-Id: I43e694c064da01e03902b6c3f634ed95f0fd13a2
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/232876
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Reviewed-by: James Price <jrprice@google.com>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>

src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc

diff --git a/src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc b/src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc
index 3afd888..152dd7e 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc
+++ b/src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc
@@ -102,13 +102,13 @@
 using namespace tint::core::number_suffixes;  // NOLINT
 using namespace tint::core::fluent_types;     // NOLINT
 
-TINT_BEGIN_DISABLE_WARNING(UNSAFE_BUFFER_USAGE);
-
 namespace tint::hlsl::writer {
 namespace {
 
 const char kTempNamePrefix[] = "tint_tmp";
 
+static constexpr std::array<char, 4> kSwizzle = {'x', 'y', 'z', 'w'};
+
 const char* ImageFormatToRWtextureType(core::TexelFormat image_format) {
     switch (image_format) {
         case core::TexelFormat::kR8Unorm:
@@ -1481,8 +1481,6 @@
         }
     }
 
-    const char swizzle[] = {'x', 'y', 'z', 'w'};
-
     using Op = DecomposeMemoryAccess::Intrinsic::Op;
     using DataType = DecomposeMemoryAccess::Intrinsic::DataType;
     switch (intrinsic->op) {
@@ -1497,7 +1495,7 @@
                 target << buffer;
                 if (scalar_offset_constant) {
                     target << "[" << (scalar_offset_index / 4) << "]."
-                           << swizzle[scalar_offset_index & 3];
+                           << kSwizzle[scalar_offset_index & 3];
                 } else {
                     target << "[" << scalar_offset_index_unified_expr << " / 4]["
                            << scalar_offset_index_unified_expr << " % 4]";
@@ -1547,7 +1545,7 @@
                 out << "float16_t(f16tof32(((" << buffer;
                 if (scalar_offset_constant) {
                     out << "[" << (scalar_offset_index / 4) << "]."
-                        << swizzle[scalar_offset_index & 3];
+                        << kSwizzle[scalar_offset_index & 3];
                     // WGSL spec ensure little endian memory layout.
                     if (scalar_offset_bytes % 4 == 0) {
                         out << ") & 0xFFFF)";
@@ -2705,7 +2703,7 @@
             // All of these builtins use the GetDimensions() method on the texture
             bool is_ms = texture_type->IsAnyOf<core::type::MultisampledTexture,
                                                core::type::DepthMultisampledTexture>();
-            int num_dimensions = 0;
+            unsigned int num_dimensions = 0;
             std::string swizzle;
 
             switch (builtin->Fn()) {
@@ -2801,7 +2799,8 @@
                 // vector. As we've grown the vector by one element, we now need to
                 // swizzle to keep the result expression equivalent.
                 if (swizzle.empty()) {
-                    static constexpr const char* swizzles[] = {"", ".x", ".xy", ".xyz"};
+                    static constexpr std::array<const char*, 4> swizzles = {"", ".x", ".xy",
+                                                                            ".xyz"};
                     swizzle = swizzles[num_dimensions - 1];
                 }
             }
@@ -2838,15 +2837,14 @@
                 if (num_dimensions == 1) {
                     pre << dims;
                 } else {
-                    static constexpr char xyzw[] = {'x', 'y', 'z', 'w'};
                     if (DAWN_UNLIKELY(num_dimensions < 0 || num_dimensions > 4)) {
                         TINT_ICE() << "vector dimensions are " << num_dimensions;
                     }
-                    for (int i = 0; i < num_dimensions; i++) {
+                    for (unsigned int i = 0; i < num_dimensions; i++) {
                         if (i > 0) {
                             pre << ", ";
                         }
-                        pre << dims << "." << xyzw[i];
+                        pre << dims << "." << kSwizzle[i];
                     }
                 }
 
@@ -3034,8 +3032,9 @@
         }
         if (wgsl_ret_width < hlsl_ret_width) {
             out << ".";
+            TINT_ASSERT(wgsl_ret_width < 3);
             for (uint32_t i = 0; i < wgsl_ret_width; i++) {
-                out << "xyz"[i];
+                out << kSwizzle[i];
             }
         }
         if (DAWN_UNLIKELY(wgsl_ret_width > hlsl_ret_width)) {
@@ -4910,5 +4909,3 @@
 }
 
 }  // namespace tint::hlsl::writer
-
-TINT_END_DISABLE_WARNING(UNSAFE_BUFFER_USAGE);