luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-04-04 10:50:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Check bytecode version before writing type information

Browse source
This commit is contained in:
GRH 2024-05-08 22:43:41 +03:00 • committed by GitHub
parent 8a64cb8b73
commit 39ab275f5f
Signed by: DevComp
GPG key ID: B5690EEEBB952194
1 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
Compiler/src/BytecodeBuilder.cpp
View file

@ -665,8 +665,11 @@ void BytecodeBuilder::finalize()
bytecode = char(version); bytecode = char(version);
uint8_t typesversion = getTypeEncodingVersion(); if (version >= 4)
writeByte(bytecode, typesversion); {
uint8_t typesversion = getTypeEncodingVersion();
writeByte(bytecode, typesversion);
}
writeStringTable(bytecode); writeStringTable(bytecode);
@ -690,45 +693,48 @@ void BytecodeBuilder::writeFunction(std::string& ss, uint32_t id, uint8_t flags)
writeByte(ss, func.numupvalues); writeByte(ss, func.numupvalues);
writeByte(ss, func.isvararg); writeByte(ss, func.isvararg);
writeByte(ss, flags); if (getVersion() >= 4)
if (FFlag::LuauCompileTypeInfo)
{ {
if (!func.typeinfo.empty() || !typedUpvals.empty() || !typedLocals.empty()) writeByte(ss, flags);
if (FFlag::LuauCompileTypeInfo)
{ {
// collect type info into a temporary string to know the overall size of type data if (!func.typeinfo.empty() || !typedUpvals.empty() || !typedLocals.empty())
tempTypeInfo.clear();
writeVarInt(tempTypeInfo, uint32_t(func.typeinfo.size()));
writeVarInt(tempTypeInfo, uint32_t(typedUpvals.size()));
writeVarInt(tempTypeInfo, uint32_t(typedLocals.size()));
tempTypeInfo.append(func.typeinfo);
for (const TypedUpval& l : typedUpvals)
writeByte(tempTypeInfo, l.type);
for (const TypedLocal& l : typedLocals)
{ {
writeByte(tempTypeInfo, l.type); // collect type info into a temporary string to know the overall size of type data
writeByte(tempTypeInfo, l.reg); tempTypeInfo.clear();
writeVarInt(tempTypeInfo, l.startpc); writeVarInt(tempTypeInfo, uint32_t(func.typeinfo.size()));
LUAU_ASSERT(l.endpc >= l.startpc); writeVarInt(tempTypeInfo, uint32_t(typedUpvals.size()));
writeVarInt(tempTypeInfo, l.endpc - l.startpc); writeVarInt(tempTypeInfo, uint32_t(typedLocals.size()));
}
writeVarInt(ss, uint32_t(tempTypeInfo.size())); tempTypeInfo.append(func.typeinfo);
ss.append(tempTypeInfo);
for (const TypedUpval& l : typedUpvals)
writeByte(tempTypeInfo, l.type);
for (const TypedLocal& l : typedLocals)
{
writeByte(tempTypeInfo, l.type);
writeByte(tempTypeInfo, l.reg);
writeVarInt(tempTypeInfo, l.startpc);
LUAU_ASSERT(l.endpc >= l.startpc);
writeVarInt(tempTypeInfo, l.endpc - l.startpc);
}
writeVarInt(ss, uint32_t(tempTypeInfo.size()));
ss.append(tempTypeInfo);
}
else
{
writeVarInt(ss, 0);
}
} }
else else
{ {
writeVarInt(ss, 0); writeVarInt(ss, uint32_t(func.typeinfo.size()));
ss.append(func.typeinfo);
} }
} }
else
{
writeVarInt(ss, uint32_t(func.typeinfo.size()));
ss.append(func.typeinfo);
}
// instructions // instructions
writeVarInt(ss, uint32_t(insns.size())); writeVarInt(ss, uint32_t(insns.size()));