Merge from Google-internal development:

- rewritten decoder; interpreted decoder is bytecode-based,
  JIT decoder no longer falls back to the interpreter.
- C++ improvements: C++11-compatible iterators, upb::reffed_ptr
  for RAII refcounting, better upcast/downcast support.
- removed the gross upb_value abstraction from public upb.h.

1 files changed, 7 insertions, 0 deletions

diff --git a/upb/pb/decoder.h b/upb/pb/decoder.h
index c1b6cb3..c645688 100644
--- a/upb/pb/decoder.h
+++ b/upb/pb/decoder.h
@@ -14,6 +14,13 @@
 
 #include "upb/sink.h"
 
+// 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
+// be replaced by a runtime-configurable limit and dynamically-resizing arrays.
+// TODO: make this a runtime-settable property of Decoder.
+#define UPB_DECODER_MAX_NESTING 64
+
 #ifdef __cplusplus
 namespace upb {
 namespace pb {