Merge branch 'data-refactoring'. Ported benchmarks.

Conflicts:

	src/upb_data.c
	src/upb_data.h

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/test_vs_proto2.cc b/tests/test_vs_proto2.cc
index 63dc0f0..4356b05 100644
--- a/tests/test_vs_proto2.cc
+++ b/tests/test_vs_proto2.cc
@@ -25,7 +25,7 @@ void compare_arrays(const google::protobuf::Reflection *r,
                     upb_msg *upb_msg, struct upb_fielddef *upb_f)
 {
   ASSERT(upb_msg_has(upb_msg, upb_f));
-  upb_array *arr = upb_msg_get(upb_msg, upb_f).arr;
+  upb_arrayptr arr = upb_msg_get(upb_msg, upb_f).arr;
   ASSERT(upb_array_len(arr) == (upb_arraylen_t)r->FieldSize(proto2_msg, proto2_f));
   for(upb_arraylen_t i = 0; i < upb_array_len(arr); i++) {
     union upb_value v = upb_array_get(arr, upb_f, i);