test_encoder passes! Other tests still need to be fixed.

1 files changed, 3 insertions, 1 deletions

diff --git a/upbc/message_layout.cc b/upbc/message_layout.cc
index 5956424..f0a6872 100644
--- a/upbc/message_layout.cc
+++ b/upbc/message_layout.cc
@@ -130,7 +130,9 @@ void MessageLayout::PlaceNonOneofFields(
   int hasbit_count = 0;
   for (auto field : field_order) {
     if (HasHasbit(field)) {
-      hasbit_indexes_[field] = hasbit_count++;
+      // We don't use hasbit 0, so that 0 can indicate "no presence" in the
+      // table. This wastes one hasbit, but we don't worry about it for now.
+      hasbit_indexes_[field] = ++hasbit_count;
     }
   }