Update Luau to 0.624

mlua-rs · May 4, 2024 · 59b4675 · 59b4675
1 parent 984568f
commit 59b4675
Show file tree

Hide file tree

Showing 35 changed files with 1,795 additions and 355 deletions.
diff --git a/luau/CodeGen/include/Luau/BytecodeAnalysis.h b/luau/CodeGen/include/Luau/BytecodeAnalysis.h
@@ -14,6 +14,7 @@ namespace CodeGen
 
 struct IrFunction;
 
+void loadBytecodeTypeInfo(IrFunction& function);
 void buildBytecodeBlocks(IrFunction& function, const std::vector<uint8_t>& jumpTargets);
 void analyzeBytecodeTypes(IrFunction& function);
 

diff --git a/luau/CodeGen/include/Luau/CodeGen.h b/luau/CodeGen/include/Luau/CodeGen.h
@@ -40,8 +40,12 @@ enum class CodeGenCompilationResult
     CodeGenAssemblerFinalizationFailure = 7,  // Failure during assembler finalization
     CodeGenLoweringFailure = 8,               // Lowering failed
     AllocationFailed = 9,                     // Native codegen failed due to an allocation error
+
+    Count = 10,
 };
 
+std::string toString(const CodeGenCompilationResult& result);
+
 struct ProtoCompilationFailure
 {
     CodeGenCompilationResult result = CodeGenCompilationResult::Success;
@@ -114,7 +118,6 @@ void setNativeExecutionEnabled(lua_State* L, bool enabled);
 using ModuleId = std::array<uint8_t, 16>;
 
 // Builds target function and all inner functions
-CodeGenCompilationResult compile_DEPRECATED(lua_State* L, int idx, unsigned int flags = 0, CompilationStats* stats = nullptr);
 CompilationResult compile(lua_State* L, int idx, unsigned int flags = 0, CompilationStats* stats = nullptr);
 CompilationResult compile(const ModuleId& moduleId, lua_State* L, int idx, unsigned int flags = 0, CompilationStats* stats = nullptr);
 
@@ -168,6 +171,7 @@ struct AssemblyOptions
     bool includeAssembly = false;
     bool includeIr = false;
     bool includeOutlinedCode = false;
+    bool includeIrTypes = false;
 
     IncludeIrPrefix includeIrPrefix = IncludeIrPrefix::Yes;
     IncludeUseInfo includeUseInfo = IncludeUseInfo::Yes;

diff --git a/luau/CodeGen/include/Luau/IrData.h b/luau/CodeGen/include/Luau/IrData.h
@@ -977,6 +977,25 @@ struct BytecodeTypes
     uint8_t c = LBC_TYPE_ANY;
 };
 
+struct BytecodeRegTypeInfo
+{
+    uint8_t type = LBC_TYPE_ANY;
+    uint8_t reg = 0; // Register slot where variable is stored
+    int startpc = 0; // First point where variable is alive (could be before variable has been assigned a value)
+    int endpc = 0;   // First point where variable is dead
+};
+
+struct BytecodeTypeInfo
+{
+    std::vector<uint8_t> argumentTypes;
+    std::vector<BytecodeRegTypeInfo> regTypes;
+    std::vector<uint8_t> upvalueTypes;
+
+    // Offsets into regTypes for each individual register
+    // One extra element at the end contains the vector size for easier arr[Rn], arr[Rn + 1] range access
+    std::vector<uint32_t> regTypeOffsets;
+};
+
 struct IrFunction
 {
     std::vector<IrBlock> blocks;
@@ -994,6 +1013,8 @@ struct IrFunction
     std::vector<IrOp> valueRestoreOps;
     std::vector<uint32_t> validRestoreOpBlocks;
 
+    BytecodeTypeInfo bcTypeInfo;
+
     Proto* proto = nullptr;
     bool variadic = false;
 

diff --git a/luau/CodeGen/include/Luau/IrDump.h b/luau/CodeGen/include/Luau/IrDump.h
@@ -30,6 +30,9 @@ void toString(IrToStringContext& ctx, const IrBlock& block, uint32_t index); //
 void toString(IrToStringContext& ctx, IrOp op);
 
 void toString(std::string& result, IrConst constant);
+
+const char* getBytecodeTypeName(uint8_t type);
+
 void toString(std::string& result, const BytecodeTypes& bcTypes);
 
 void toStringDetailed(

diff --git a/luau/CodeGen/src/AssemblyBuilderX64.cpp b/luau/CodeGen/src/AssemblyBuilderX64.cpp
@@ -826,7 +826,7 @@ void AssemblyBuilderX64::vcvtss2sd(OperandX64 dst, OperandX64 src1, OperandX64 s
     else
         CODEGEN_ASSERT(src2.memSize == SizeX64::dword);
 
-    placeAvx("vcvtsd2ss", dst, src1, src2, 0x5a, false, AVX_0F, AVX_F3);
+    placeAvx("vcvtss2sd", dst, src1, src2, 0x5a, false, AVX_0F, AVX_F3);
 }
 
 void AssemblyBuilderX64::vroundsd(OperandX64 dst, OperandX64 src1, OperandX64 src2, RoundingModeX64 roundingMode)