Merge from Google-internal development.

- Better error reporting for upb::Def setters.
- error reporting for upb::Handlers setters.
- made the start/endmsg handlers a little less special-cased.

1 files changed, 7 insertions, 0 deletions

diff --git a/upb/upb.h b/upb/upb.h
index 86cae88..fcf1b65 100644
--- a/upb/upb.h
+++ b/upb/upb.h
@@ -163,6 +163,13 @@ char *upb_strdup(const char *s);
 // debug mode.
 #define UPB_ASSERT_VAR(var, predicate) UPB_UNUSED(var); assert(predicate)
 
+#define UPB_ASSERT_STATUS(status) do { \
+  if (!upb_ok(status)) { \
+    fprintf(stderr, "upb status failure: %s\n", upb_status_getstr(status)); \
+    assert(upb_ok(status)); \
+  } \
+  } while (0)
+
 // The maximum that any submessages can be nested.  Matches proto2's limit.
 // At the moment this specifies the size of several statically-sized arrays
 // and therefore setting it high will cause more memory to be used.  Will