Skip to content

Disable fasttable when executing 32bit decoder on 64bit cpu. #28816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jul 28, 2026
+24 −2
Merged

Disable fasttable when executing 32bit decoder on 64bit cpu. #28816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions upb/mini_descriptor/decode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,8 +824,11 @@ static upb_MiniTable* upb_MtDecoder_DoBuildMiniTableWithBuf(

#if UPB_FASTTABLE
upb_DecodeFast_TableEntry fasttable[32];
int fasttable_size = upb_DecodeFast_BuildTable(&decoder->table, fasttable);
mt_size += fasttable_size * sizeof(fasttable[0]);
int fasttable_size = 0;
if (decoder->platform == kUpb_MiniTablePlatform_64Bit) {
fasttable_size = upb_DecodeFast_BuildTable(&decoder->table, fasttable);
mt_size += fasttable_size * sizeof(fasttable[0]);
}
#endif

upb_MiniTable* ret = upb_Arena_Malloc(decoder->arena, mt_size);
Expand Down
19 changes: 19 additions & 0 deletions upb/mini_descriptor/internal/encode_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,3 +339,22 @@ TEST_P(MiniTableTest, Extendible) {
EXPECT_EQ(kUpb_ExtMode_Extendable,
table->UPB_PRIVATE(ext) & kUpb_ExtMode_Extendable);
}

TEST(MiniTableTest, Build32BitMiniTableWithSubmessagesNoFastTableAssert) {
upb::Arena arena;
upb::MtDataEncoder e;

ASSERT_TRUE(e.StartMessage(0));
ASSERT_TRUE(e.PutField(kUpb_FieldType_Message, 1, 0));
ASSERT_TRUE(e.PutField(kUpb_FieldType_Message, 2, 0));
ASSERT_TRUE(e.PutField(kUpb_FieldType_Message, 3, 0));

upb::Status status;
upb_MiniTable* table = _upb_MiniTable_Build(e.data().data(), e.data().size(),
kUpb_MiniTablePlatform_32Bit,
arena.ptr(), status.ptr());

ASSERT_NE(nullptr, table) << status.error_message();
EXPECT_EQ(3, upb_MiniTable_FieldCount(table));
EXPECT_EQ(0xff, table->UPB_PRIVATE(table_mask));
}
Loading