Merge branch 'main' into python-repeated

python/pb_unit_tests/reflection_test_wrapper.py

@@ -93,14 +93,10 @@ reflection_test.ReflectionTest.testMergeFromAllFields_proto2.__unittest_expectin
 reflection_test.ReflectionTest.testMergeFromAllFields_proto3.__unittest_expecting_failure__ = True
 reflection_test.ReflectionTest.testMixedConstructor_proto2.__unittest_expecting_failure__ = True
 reflection_test.ReflectionTest.testMixedConstructor_proto3.__unittest_expecting_failure__ = True
-reflection_test.ReflectionTest.testRepeatedListFields_proto2.__unittest_expecting_failure__ = True
-reflection_test.ReflectionTest.testRepeatedListFields_proto3.__unittest_expecting_failure__ = True
 reflection_test.ReflectionTest.testRepeatedScalarTypeSafety_proto2.__unittest_expecting_failure__ = True
 reflection_test.ReflectionTest.testRepeatedScalarTypeSafety_proto3.__unittest_expecting_failure__ = True
 reflection_test.ReflectionTest.testSingleScalarTypeSafety_proto2.__unittest_expecting_failure__ = True
 reflection_test.ReflectionTest.testSingleScalarTypeSafety_proto3.__unittest_expecting_failure__ = True
-reflection_test.ReflectionTest.testSingularListFields_proto2.__unittest_expecting_failure__ = True
-reflection_test.ReflectionTest.testSingularListFields_proto3.__unittest_expecting_failure__ = True
 reflection_test.ReflectionTest.testStaticParseFrom_proto2.__unittest_expecting_failure__ = True
 reflection_test.ReflectionTest.testStaticParseFrom_proto3.__unittest_expecting_failure__ = True
 reflection_test.SerializationTest.testCanonicalSerializationOrder.__unittest_expecting_failure__ = True

upb/def.c

@@ -47,7 +47,9 @@ typedef struct {
 /* The upb core does not generally have a concept of default instances. However
  * for descriptor options we make an exception since the max size is known and
  * modest (<200 bytes). All types can share a default instance since it is
- * initialized to zeroes. */
+ * initialized to zeroes.
+ *
+ * We have to allocate an extra pointer for upb's internal metadata. */
 static const char opt_default_buf[_UPB_MAXOPT_SIZE + sizeof(void*)] = {0};
 static const char *opt_default = &opt_default_buf[sizeof(void*)];
 
@@ -1444,7 +1446,7 @@ void *symtab_alloc(symtab_addctx *ctx, size_t bytes) {
     target = google_protobuf_##options_type##_parse(pb, size, ctx->arena);    \
     CHK_OOM(target);                                                          \
   } else {                                                                    \
-    target = (const google_protobuf_##options_type *)&opt_default;            \
+    target = (const google_protobuf_##options_type *)opt_default;             \
   }
 
 static void check_ident(symtab_addctx *ctx, upb_strview name, bool full) {