From 1557ac95ffade68b0d48b158947c9c9e46018aeb Mon Sep 17 00:00:00 2001
From: Justin King <jcking@google.com>
Date: Wed, 31 Jan 2024 06:57:55 -0800
Subject: [PATCH] Add `ABSL_CONST_INIT` and change `std::pair<uint8_t,
 uint8_t>` to `std::pair<const uint8_t, const uint8_t>`

PiperOrigin-RevId: 603036005
---
 internal/utf8.cc | 57 +++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/internal/utf8.cc b/internal/utf8.cc
index d8ac4f654..d4302203b 100644
--- a/internal/utf8.cc
+++ b/internal/utf8.cc
@@ -20,9 +20,11 @@
 #include <string>
 #include <utility>
 
+#include "absl/base/attributes.h"
 #include "absl/base/macros.h"
 #include "absl/base/optimization.h"
 #include "absl/log/absl_check.h"
+#include "absl/strings/cord.h"
 #include "absl/strings/string_view.h"
 #include "internal/unicode.h"
 
@@ -34,35 +36,35 @@ namespace cel::internal {
 
 namespace {
 
-constexpr uint8_t kUtf8RuneSelf = 0x80;
-constexpr size_t kUtf8Max = 4;
+ABSL_CONST_INIT constexpr uint8_t kUtf8RuneSelf = 0x80;
+ABSL_CONST_INIT constexpr size_t kUtf8Max = 4;
 
-constexpr uint8_t kLow = 0x80;
-constexpr uint8_t kHigh = 0xbf;
+ABSL_CONST_INIT constexpr uint8_t kLow = 0x80;
+ABSL_CONST_INIT constexpr uint8_t kHigh = 0xbf;
 
-constexpr uint8_t kMaskX = 0x3f;
-constexpr uint8_t kMask2 = 0x1f;
-constexpr uint8_t kMask3 = 0xf;
-constexpr uint8_t kMask4 = 0x7;
+ABSL_CONST_INIT constexpr uint8_t kMaskX = 0x3f;
+ABSL_CONST_INIT constexpr uint8_t kMask2 = 0x1f;
+ABSL_CONST_INIT constexpr uint8_t kMask3 = 0xf;
+ABSL_CONST_INIT constexpr uint8_t kMask4 = 0x7;
 
-constexpr uint8_t kTX = 0x80;
-constexpr uint8_t kT2 = 0xc0;
-constexpr uint8_t kT3 = 0xe0;
-constexpr uint8_t kT4 = 0xf0;
+ABSL_CONST_INIT constexpr uint8_t kTX = 0x80;
+ABSL_CONST_INIT constexpr uint8_t kT2 = 0xc0;
+ABSL_CONST_INIT constexpr uint8_t kT3 = 0xe0;
+ABSL_CONST_INIT constexpr uint8_t kT4 = 0xf0;
 
-constexpr uint8_t kXX = 0xf1;
-constexpr uint8_t kAS = 0xf0;
-constexpr uint8_t kS1 = 0x02;
-constexpr uint8_t kS2 = 0x13;
-constexpr uint8_t kS3 = 0x03;
-constexpr uint8_t kS4 = 0x23;
-constexpr uint8_t kS5 = 0x34;
-constexpr uint8_t kS6 = 0x04;
-constexpr uint8_t kS7 = 0x44;
+ABSL_CONST_INIT constexpr uint8_t kXX = 0xf1;
+ABSL_CONST_INIT constexpr uint8_t kAS = 0xf0;
+ABSL_CONST_INIT constexpr uint8_t kS1 = 0x02;
+ABSL_CONST_INIT constexpr uint8_t kS2 = 0x13;
+ABSL_CONST_INIT constexpr uint8_t kS3 = 0x03;
+ABSL_CONST_INIT constexpr uint8_t kS4 = 0x23;
+ABSL_CONST_INIT constexpr uint8_t kS5 = 0x34;
+ABSL_CONST_INIT constexpr uint8_t kS6 = 0x04;
+ABSL_CONST_INIT constexpr uint8_t kS7 = 0x44;
 
 // NOLINTBEGIN
 // clang-format off
-constexpr uint8_t kLeading[256] = {
+ABSL_CONST_INIT constexpr uint8_t kLeading[256] = {
   //   1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
   kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, // 0x00-0x0F
   kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, // 0x10-0x1F
@@ -85,11 +87,12 @@ constexpr uint8_t kLeading[256] = {
 // clang-format on
 // NOLINTEND
 
-constexpr std::pair<uint8_t, uint8_t> kAccept[16] = {
-    {kLow, kHigh}, {0xa0, kHigh}, {kLow, 0x9f}, {0x90, kHigh},
-    {kLow, 0x8f},  {0x0, 0x0},    {0x0, 0x0},   {0x0, 0x0},
-    {0x0, 0x0},    {0x0, 0x0},    {0x0, 0x0},   {0x0, 0x0},
-    {0x0, 0x0},    {0x0, 0x0},    {0x0, 0x0},   {0x0, 0x0},
+ABSL_CONST_INIT constexpr std::pair<const uint8_t, const uint8_t> kAccept[16] =
+    {
+        {kLow, kHigh}, {0xa0, kHigh}, {kLow, 0x9f}, {0x90, kHigh},
+        {kLow, 0x8f},  {0x0, 0x0},    {0x0, 0x0},   {0x0, 0x0},
+        {0x0, 0x0},    {0x0, 0x0},    {0x0, 0x0},   {0x0, 0x0},
+        {0x0, 0x0},    {0x0, 0x0},    {0x0, 0x0},   {0x0, 0x0},
 };
 
 class StringReader final {