Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Fix dynamic struct decoding for nested structs (#7346)

Browse Source 
After a struct-type field descriptor had offsets calculated more than once, IsBitField would return true, causing the second call to CalculateOffsets to calculate incorrect offsets.
This commit is contained in:
Ryan Blue
2024-11-05 08:43:04 -05:00
committed by GitHub
parent 8588b5e520
commit 7a6c7af412
5 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wpiutil/src/test/native/cpp/struct/DynamicStructTest.cpp
View File

@@ -43,16 +43,36 @@ TEST_F(DynamicStructTest, DelayedValid) {
auto desc = db.Add("test", "foo a", &err);
ASSERT_TRUE(desc);
ASSERT_FALSE(desc->IsValid());
auto desc2 = db.Add("test2", "foo a[2]", &err);
auto desc2 = db.Add("test2", "foo a;foo b;", &err);
ASSERT_TRUE(desc2);
ASSERT_FALSE(desc2->IsValid());
auto desc3 = db.Add("foo", "int32 a", &err);
auto desc3 = db.Add("test3", "foo a[2]", &err);
ASSERT_TRUE(desc3);
ASSERT_TRUE(desc3->IsValid());
ASSERT_FALSE(desc3->IsValid());
auto desc4 = db.Add("foo", "int32 a", &err);
ASSERT_TRUE(desc4);
ASSERT_TRUE(desc4->IsValid());
ASSERT_TRUE(desc->IsValid());
ASSERT_EQ(desc->GetSize(), 4u);
ASSERT_TRUE(desc2->IsValid());
ASSERT_EQ(desc2->GetSize(), 8u);
ASSERT_TRUE(desc3->IsValid());
ASSERT_EQ(desc3->GetSize(), 8u);
}
TEST_F(DynamicStructTest, ReuseNestedStructDelayed) {
auto desc2 = db.Add("test2", "test a;test b;", &err);
auto desc = db.Add("test", "int32 a; uint16 b; int16 c;", &err);
ASSERT_TRUE(desc);
ASSERT_TRUE(desc->IsValid());
ASSERT_TRUE(desc2);
ASSERT_TRUE(desc2->IsValid());
ASSERT_EQ(desc2->GetSize(), 16u);
auto fields = desc2->GetFields();
ASSERT_EQ(fields[0].GetOffset(), 0u);
ASSERT_EQ(fields[0].GetName(), "a");
ASSERT_EQ(fields[1].GetOffset(), 8u);
ASSERT_EQ(fields[1].GetName(), "b");
}
TEST_F(DynamicStructTest, InvalidBitfield) {