Merge commit 'c6d2315315a77b62a9d6add8414aeda81641d37c' into upb_upgrade

5 years ago · e5c40499ab
parent 35fc0b4c10 c6d2315315
commit e5c40499ab
2 changed files with 2 additions and 2 deletions
--- a/third_party/upb/upb/decode.c
+++ b/third_party/upb/upb/decode.c
@ -222,7 +222,7 @@ static void decode_munge(int type, wireval *val) {

 static const upb_msglayout_field *upb_find_field(const upb_msglayout *l,
                                                 uint32_t field_number) {
-  static upb_msglayout_field none = {0};
+  static upb_msglayout_field none = {0, 0, 0, 0, 0, 0};

  /* Lots of optimization opportunities here. */
  int i;
--- a/third_party/upb/upb/msg.h
+++ b/third_party/upb/upb/msg.h
@ -141,7 +141,7 @@ UPB_INLINE uint32_t _upb_getoneofcase(const void *msg, size_t case_ofs) {

 UPB_INLINE size_t _upb_oneofcase_ofs(const upb_msglayout_field *f) {
  UPB_ASSERT(f->presence < 0);
-  return ~(int64_t)f->presence;
+  return ~(ptrdiff_t)f->presence;
 }

 UPB_INLINE uint32_t *_upb_oneofcase_field(upb_msg *msg,