commit 34c692f0f99bd839b375159284c5a095bcd39dda
author Eric Salo <salo@google.com> Tue Jun 06 17:13:28 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jun 06 17:14:01 2023 -0700
tree 11747adf6f9eb37ad50cf72cb1162aa4ddf18f27
parent 532b4d0671c806f3f590fb0313b8fc73bd460c6d

upb: cast gencode enums in bitwise ops to make C++20 happy

Reference: https://github.com/protocolbuffers/upb/issues/1340
PiperOrigin-RevId: 538332530

upbc/protoc-gen-upb.cc

diff --git a/upbc/protoc-gen-upb.cc b/upbc/protoc-gen-upb.cc
index e91c0be..8451564 100644
--- a/upbc/protoc-gen-upb.cc
+++ b/upbc/protoc-gen-upb.cc
@@ -1263,31 +1263,31 @@
   uint8_t mode32 = field32->mode;
   switch (mode32 & kUpb_FieldMode_Mask) {
     case kUpb_FieldMode_Map:
-      ret = "kUpb_FieldMode_Map";
+      ret = "(int)kUpb_FieldMode_Map";
       break;
     case kUpb_FieldMode_Array:
-      ret = "kUpb_FieldMode_Array";
+      ret = "(int)kUpb_FieldMode_Array";
       break;
     case kUpb_FieldMode_Scalar:
-      ret = "kUpb_FieldMode_Scalar";
+      ret = "(int)kUpb_FieldMode_Scalar";
       break;
     default:
       break;
   }
 
   if (mode32 & kUpb_LabelFlags_IsPacked) {
-    absl::StrAppend(&ret, " | kUpb_LabelFlags_IsPacked");
+    absl::StrAppend(&ret, " | (int)kUpb_LabelFlags_IsPacked");
   }
 
   if (mode32 & kUpb_LabelFlags_IsExtension) {
-    absl::StrAppend(&ret, " | kUpb_LabelFlags_IsExtension");
+    absl::StrAppend(&ret, " | (int)kUpb_LabelFlags_IsExtension");
   }
 
   if (mode32 & kUpb_LabelFlags_IsAlternate) {
-    absl::StrAppend(&ret, " | kUpb_LabelFlags_IsAlternate");
+    absl::StrAppend(&ret, " | (int)kUpb_LabelFlags_IsAlternate");
   }
 
-  absl::StrAppend(&ret, " | (", GetFieldRep(field32, field64),
+  absl::StrAppend(&ret, " | ((int)", GetFieldRep(field32, field64),
                   " << kUpb_FieldRep_Shift)");
   return ret;
 }