commit 65541cbf748bbde2c912bd7690fb6cc0f80f4cb3
author James Kuszmaul <james.kuszmaul@bluerivertech.com> Tue Nov 08 14:53:47 2022 -0800
committer James Kuszmaul <james.kuszmaul@bluerivertech.com> Tue Nov 08 16:22:54 2022 -0800
tree f9c9eb3dc2d757ecbf9beea9df0111e28d49c1c4
parent 5ab990d10cb49c64919254b9654f6e35a481f86f
parent 3b15b0cb7fc8b8ce37d3dd0d826dd522e6e5d2ab

Merge commit '6dccd64de51ea960cb6f0d975768c874814b4c75' into HEAD

Update flatbuffers. Relevant merge tasks:
* A field got added to reflection.fbs; this had fallout in
  reflection_generated.h and the logger_test shas.
* Resolved merge conflict in rust/flatbuffers/src/lib.rs
* Reverted upstream change that made Table rust struct members private.
* FlatBufferBuilder Create*Vector calls now include alignment.
* nim codegen got added; needed to update to use scoped enums.

Main fix that motivated this update is
https://github.com/google/flatbuffers/pull/7588

Change-Id: I6bbe5d56846f426fa5f2a82c4f2bc77be2b93bb0
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>

aos/events/logging/logger_test.cc

diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index cf5ec32..c99a7c8 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -3757,11 +3757,11 @@
 }
 
 constexpr std::string_view kCombinedConfigSha1(
-    "c10ca3c1efa7924d48859000b6671eadc007b6373c81d07138a385dfdbb33d69");
+    "5d73fe35bacaa59d24f8f0c1a806fe10b783b0fcc80809ee30a9db824e82538b");
 constexpr std::string_view kSplitConfigSha1(
-    "f8df4ee52e137025dac96303f8d38a5324fd819d1c22ff018754dd56c3ca64e8");
+    "f25e8f6f90d61f41c41517e652300566228b077e44cd86f1af2af4a9bed31ad4");
 constexpr std::string_view kReloggedSplitConfigSha1(
-    "3154b2a9f9819d676d40c689a6c2967c2c64152c2845673b78d0c1cdc368d3ec");
+    "f1fabd629bdf8735c3d81bc791d7a454e8e636951c26cba6426545cbc97f911f");
 
 INSTANTIATE_TEST_SUITE_P(
     All, MultinodeLoggerTest,

aos/events/shm_event_loop_test.cc

diff --git a/aos/events/shm_event_loop_test.cc b/aos/events/shm_event_loop_test.cc
index f119479..90a6d1c 100644
--- a/aos/events/shm_event_loop_test.cc
+++ b/aos/events/shm_event_loop_test.cc
@@ -350,7 +350,7 @@
 
   auto builder = sender.MakeBuilder();
   uint8_t *buffer;
-  builder.fbb()->CreateUninitializedVector(5, 1, &buffer);
+  builder.fbb()->CreateUninitializedVector(5, &buffer);
   EXPECT_GE(reinterpret_cast<char *>(buffer), shared_memory.begin());
   EXPECT_LT(reinterpret_cast<char *>(buffer), shared_memory.end());
 }

aos/flatbuffer_merge.cc

diff --git a/aos/flatbuffer_merge.cc b/aos/flatbuffer_merge.cc
index 17f4468..f89165b 100644
--- a/aos/flatbuffer_merge.cc
+++ b/aos/flatbuffer_merge.cc
@@ -164,7 +164,7 @@
     }
 
     // Start the vector.
-    fbb->StartVector(size, inline_size);
+    fbb->StartVector(size, inline_size, /*align=*/inline_size);
 
     for (const flatbuffers::Offset<flatbuffers::String> &element :
          string_elements) {
@@ -214,7 +214,7 @@
         flatbuffers::InlineSize(elementary_type, nullptr);
 
     // Start the vector.
-    fbb->StartVector(size, inline_size);
+    fbb->StartVector(size, inline_size, /*align=*/inline_size);
 
     // Pack the contents in in reverse order.
     if (t2_has) {
@@ -306,7 +306,7 @@
     }
 
     // Start the vector.
-    fbb->StartVector(size, inline_size);
+    fbb->StartVector(size, inline_size, /*align=*/inline_size);
 
     for (const flatbuffers::Offset<flatbuffers::Table> &element :
          object_elements) {

aos/json_to_flatbuffer.cc

diff --git a/aos/json_to_flatbuffer.cc b/aos/json_to_flatbuffer.cc
index e7b62d4..825bb3c 100644
--- a/aos/json_to_flatbuffer.cc
+++ b/aos/json_to_flatbuffer.cc
@@ -580,8 +580,9 @@
 
 bool JsonParser::FinishVector(int field_index) {
   // Vectors have a start (unfortunately which needs to know the size)
-  fbb_->StartVector(stack_.back().vector_elements.size(),
-                    stack_.back().type.FieldInlineSize(field_index));
+  const size_t inline_size = stack_.back().type.FieldInlineSize(field_index);
+  fbb_->StartVector(stack_.back().vector_elements.size(), inline_size,
+                    /*align=*/inline_size);
 
   const flatbuffers::ElementaryType elementary_type =
       stack_.back().type.FieldElementaryType(field_index);