From 7ddaa7ed3f1475c49398a5bc80898cd75f83f578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20Korde=C5=BE?= <jakobkordez1999@gmail.com>
Date: Fri, 31 Oct 2025 11:17:34 +0100
Subject: [PATCH] Fix struct vector ordering in pack function

---
 dart/test/monster_test_my_game.example_generated.dart | 6 +++---
 src/idl_gen_dart.cpp                                  | 4 ++--
 tests/monster_test_my_game.example_generated.dart     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dart/test/monster_test_my_game.example_generated.dart b/dart/test/monster_test_my_game.example_generated.dart
index 7be3afa8906..3f11d7cea9b 100644
--- a/dart/test/monster_test_my_game.example_generated.dart
+++ b/dart/test/monster_test_my_game.example_generated.dart
@@ -1578,7 +1578,7 @@ class MonsterT implements fb.Packable {
     final int? testOffset = test?.pack(fbBuilder);
     int? test4Offset;
     if (test4 != null) {
-      for (var e in test4!) {
+      for (var e in test4!.reversed) {
         e.pack(fbBuilder);
       }
       test4Offset = fbBuilder.endStructVector(test4!.length);
@@ -1608,7 +1608,7 @@ class MonsterT implements fb.Packable {
           );
     int? testarrayofsortedstructOffset;
     if (testarrayofsortedstruct != null) {
-      for (var e in testarrayofsortedstruct!) {
+      for (var e in testarrayofsortedstruct!.reversed) {
         e.pack(fbBuilder);
       }
       testarrayofsortedstructOffset = fbBuilder.endStructVector(
@@ -1620,7 +1620,7 @@ class MonsterT implements fb.Packable {
         : fbBuilder.writeListUint8(flex!);
     int? test5Offset;
     if (test5 != null) {
-      for (var e in test5!) {
+      for (var e in test5!.reversed) {
         e.pack(fbBuilder);
       }
       test5Offset = fbBuilder.endStructVector(test5!.length);
diff --git a/src/idl_gen_dart.cpp b/src/idl_gen_dart.cpp
index 52fc8772f24..062313f5505 100644
--- a/src/idl_gen_dart.cpp
+++ b/src/idl_gen_dart.cpp
@@ -1025,8 +1025,8 @@ class DartGenerator : public BaseGenerator {
           field.value.type.struct_def->fixed) {
         code += "    int? " + offset_name + ";\n";
         code += "    if (" + field_name + " != null) {\n";
-        code +=
-            "      for (var e in " + field_name + "!) { e.pack(fbBuilder); }\n";
+        code += "      for (var e in " + field_name +
+                "!.reversed) { e.pack(fbBuilder); }\n";
         code += "      " + namer_.Variable(field) +
                 "Offset = fbBuilder.endStructVector(" + field_name +
                 "!.length);\n";
diff --git a/tests/monster_test_my_game.example_generated.dart b/tests/monster_test_my_game.example_generated.dart
index 5554c4c4b1d..5bdd1ddfcf1 100644
--- a/tests/monster_test_my_game.example_generated.dart
+++ b/tests/monster_test_my_game.example_generated.dart
@@ -1412,7 +1412,7 @@ class MonsterT implements fb.Packable {
     final int? testOffset = test?.pack(fbBuilder);
     int? test4Offset;
     if (test4 != null) {
-      for (var e in test4!) { e.pack(fbBuilder); }
+      for (var e in test4!.reversed) { e.pack(fbBuilder); }
       test4Offset = fbBuilder.endStructVector(test4!.length);
     }
     final int? testarrayofstringOffset = testarrayofstring == null ? null
@@ -1429,14 +1429,14 @@ class MonsterT implements fb.Packable {
         : fbBuilder.writeList(testarrayofstring2!.map(fbBuilder.writeString).toList());
     int? testarrayofsortedstructOffset;
     if (testarrayofsortedstruct != null) {
-      for (var e in testarrayofsortedstruct!) { e.pack(fbBuilder); }
+      for (var e in testarrayofsortedstruct!.reversed) { e.pack(fbBuilder); }
       testarrayofsortedstructOffset = fbBuilder.endStructVector(testarrayofsortedstruct!.length);
     }
     final int? flexOffset = flex == null ? null
         : fbBuilder.writeListUint8(flex!);
     int? test5Offset;
     if (test5 != null) {
-      for (var e in test5!) { e.pack(fbBuilder); }
+      for (var e in test5!.reversed) { e.pack(fbBuilder); }
       test5Offset = fbBuilder.endStructVector(test5!.length);
     }
     final int? vectorOfLongsOffset = vectorOfLongs == null ? null