Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit df5d08e722ce · 2025-09-05T11:58:20.000Z
bd96522 Fix argument parser not handling noexcept functions (PR #4404)
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaDefs.h
@@ -77,7 +77,7 @@ class CLuaDefs
     template <auto ReturnOnError, auto T>
     static inline int ArgumentParserWarn(lua_State* L)
     {
-        return CLuaFunctionParser<false, ReturnOnError, T>()(L, m_pScriptDebugging);
+        return CLuaFunctionParser<false, ReturnOnError, remove_noexcept_fn_v<T>>()(L, m_pScriptDebugging);
     }
 
     // Special case for overloads
@@ -87,8 +87,8 @@ class CLuaDefs
     {
         // Pad functions to have the same number of parameters by
         // filling both up to the larger number of parameters with dummy_type arguments
-        using PaddedFunctionA = pad_func_with_func<FunctionA, FunctionB>;
-        using PaddedFunctionB = pad_func_with_func<FunctionB, FunctionA>;
+        using PaddedFunctionA = pad_func_with_func<remove_noexcept_fn_v<FunctionA>, remove_noexcept_fn_v<FunctionB>>;
+        using PaddedFunctionB = pad_func_with_func<remove_noexcept_fn_v<FunctionB>, remove_noexcept_fn_v<FunctionA>>;
         // Combine functions
         using Overload = CLuaOverloadParser<PaddedFunctionA::Call, PaddedFunctionB::Call>;
 
@@ -99,7 +99,7 @@ class CLuaDefs
     template <auto T>
     static inline int ArgumentParser(lua_State* L)
     {
-        return CLuaFunctionParser<true, nullptr, T>()(L, m_pScriptDebugging);
+        return CLuaFunctionParser<true, nullptr, remove_noexcept_fn_v<T>>()(L, m_pScriptDebugging);
     }
 
     // Special case for overloads
@@ -109,8 +109,8 @@ class CLuaDefs
     {
         // Pad functions to have the same number of parameters by
         // filling both up to the larger number of parameters with dummy_type arguments
-        using PaddedFunctionA = pad_func_with_func<FunctionA, FunctionB>;
-        using PaddedFunctionB = pad_func_with_func<FunctionB, FunctionA>;
+        using PaddedFunctionA = pad_func_with_func<remove_noexcept_fn_v<FunctionA>, remove_noexcept_fn_v<FunctionB>>;
+        using PaddedFunctionB = pad_func_with_func<remove_noexcept_fn_v<FunctionB>, remove_noexcept_fn_v<FunctionA>>;
         // Combine functions
         using Overload = CLuaOverloadParser<PaddedFunctionA::Call, PaddedFunctionB::Call>;
 
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaDefs.h
@@ -96,7 +96,7 @@ class CLuaDefs
     template <auto ReturnOnError, auto T>
     static inline int ArgumentParserWarn(lua_State* L)
     {
-        return CLuaFunctionParser<false, ReturnOnError, T>()(L, m_pScriptDebugging);
+        return CLuaFunctionParser<false, ReturnOnError, remove_noexcept_fn_v<T>>()(L, m_pScriptDebugging);
     }
 
     // Special case for overloads
@@ -106,8 +106,8 @@ class CLuaDefs
     {
         // Pad functions to have the same number of parameters by
         // filling both up to the larger number of parameters with dummy_type arguments
-        using PaddedFunctionA = pad_func_with_func<FunctionA, FunctionB>;
-        using PaddedFunctionB = pad_func_with_func<FunctionB, FunctionA>;
+        using PaddedFunctionA = pad_func_with_func<remove_noexcept_fn_v<FunctionA>, remove_noexcept_fn_v<FunctionB>>;
+        using PaddedFunctionB = pad_func_with_func<remove_noexcept_fn_v<FunctionB>, remove_noexcept_fn_v<FunctionA>>;
         // Combine functions
         using Overload = CLuaOverloadParser<PaddedFunctionA::Call, PaddedFunctionB::Call>;
 
@@ -118,7 +118,7 @@ class CLuaDefs
     template <auto T>
     static inline int ArgumentParser(lua_State* L)
     {
-        return CLuaFunctionParser<true, nullptr, T>()(L, m_pScriptDebugging);
+        return CLuaFunctionParser<true, nullptr, remove_noexcept_fn_v<T>>()(L, m_pScriptDebugging);
     }
 
     // Special case for overloads
@@ -128,8 +128,8 @@ class CLuaDefs
     {
         // Pad functions to have the same number of parameters by
         // filling both up to the larger number of parameters with dummy_type arguments
-        using PaddedFunctionA = pad_func_with_func<FunctionA, FunctionB>;
-        using PaddedFunctionB = pad_func_with_func<FunctionB, FunctionA>;
+        using PaddedFunctionA = pad_func_with_func<remove_noexcept_fn_v<FunctionA>, remove_noexcept_fn_v<FunctionB>>;
+        using PaddedFunctionB = pad_func_with_func<remove_noexcept_fn_v<FunctionB>, remove_noexcept_fn_v<FunctionA>>;
         // Combine functions
         using Overload = CLuaOverloadParser<PaddedFunctionA::Call, PaddedFunctionB::Call>;
 
diff --git a/Shared/sdk/SharedUtil.Template.h b/Shared/sdk/SharedUtil.Template.h
@@ -250,3 +250,38 @@ struct pad_func_with_func<Func, FuncB>
                                                      std::max(sizeof...(Args), sizeof...(ArgsB)) - sizeof...(Args) == 0>::type>
 {
 };
+
+// Removes noexcept(true) from a function type
+template <typename T>
+struct remove_noexcept
+{
+    using type = T;
+};
+
+template <typename R, typename... Args>
+struct remove_noexcept<R(Args...) noexcept>
+{
+    using type = R(Args...);
+};
+
+template <typename T>
+using remove_noexcept_t = typename remove_noexcept<T>::type;
+
+// Removes noexcept(true) from a function
+template <typename T>
+struct remove_noexcept_fn;
+
+template <typename R, typename... Args>
+struct remove_noexcept_fn<R (*)(Args...) noexcept>
+{
+    using type = R (*)(Args...);
+};
+
+template <typename R, typename... Args>
+struct remove_noexcept_fn<R (*)(Args...)>
+{
+    using type = R (*)(Args...);
+};
+
+template <auto Func>
+constexpr auto remove_noexcept_fn_v = static_cast<typename remove_noexcept_fn<decltype(Func)>::type>(Func);

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class CLuaDefs`
`77`	`77`	`template <auto ReturnOnError, auto T>`
`78`	`78`	`static inline int ArgumentParserWarn(lua_State* L)`
`79`	`79`	`{`
`80`		`- return CLuaFunctionParser<false, ReturnOnError, T>()(L, m_pScriptDebugging);`
	`80`	`+ return CLuaFunctionParser<false, ReturnOnError, remove_noexcept_fn_v<T>>()(L, m_pScriptDebugging);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// Special case for overloads`
`@@ -87,8 +87,8 @@ class CLuaDefs`
`87`	`87`	`{`
`88`	`88`	`// Pad functions to have the same number of parameters by`
`89`	`89`	`// filling both up to the larger number of parameters with dummy_type arguments`
`90`		`- using PaddedFunctionA = pad_func_with_func<FunctionA, FunctionB>;`
`91`		`- using PaddedFunctionB = pad_func_with_func<FunctionB, FunctionA>;`
	`90`	`+ using PaddedFunctionA = pad_func_with_func<remove_noexcept_fn_v<FunctionA>, remove_noexcept_fn_v<FunctionB>>;`
	`91`	`+ using PaddedFunctionB = pad_func_with_func<remove_noexcept_fn_v<FunctionB>, remove_noexcept_fn_v<FunctionA>>;`
`92`	`92`	`// Combine functions`
`93`	`93`	`using Overload = CLuaOverloadParser<PaddedFunctionA::Call, PaddedFunctionB::Call>;`
`94`	`94`
`@@ -99,7 +99,7 @@ class CLuaDefs`
`99`	`99`	`template <auto T>`
`100`	`100`	`static inline int ArgumentParser(lua_State* L)`
`101`	`101`	`{`
`102`		`- return CLuaFunctionParser<true, nullptr, T>()(L, m_pScriptDebugging);`
	`102`	`+ return CLuaFunctionParser<true, nullptr, remove_noexcept_fn_v<T>>()(L, m_pScriptDebugging);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`// Special case for overloads`
`@@ -109,8 +109,8 @@ class CLuaDefs`
`109`	`109`	`{`
`110`	`110`	`// Pad functions to have the same number of parameters by`
`111`	`111`	`// filling both up to the larger number of parameters with dummy_type arguments`
`112`		`- using PaddedFunctionA = pad_func_with_func<FunctionA, FunctionB>;`
`113`		`- using PaddedFunctionB = pad_func_with_func<FunctionB, FunctionA>;`
	`112`	`+ using PaddedFunctionA = pad_func_with_func<remove_noexcept_fn_v<FunctionA>, remove_noexcept_fn_v<FunctionB>>;`
	`113`	`+ using PaddedFunctionB = pad_func_with_func<remove_noexcept_fn_v<FunctionB>, remove_noexcept_fn_v<FunctionA>>;`
`114`	`114`	`// Combine functions`
`115`	`115`	`using Overload = CLuaOverloadParser<PaddedFunctionA::Call, PaddedFunctionB::Call>;`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class CLuaDefs`
`96`	`96`	`template <auto ReturnOnError, auto T>`
`97`	`97`	`static inline int ArgumentParserWarn(lua_State* L)`
`98`	`98`	`{`
`99`		`- return CLuaFunctionParser<false, ReturnOnError, T>()(L, m_pScriptDebugging);`
	`99`	`+ return CLuaFunctionParser<false, ReturnOnError, remove_noexcept_fn_v<T>>()(L, m_pScriptDebugging);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`// Special case for overloads`
`@@ -106,8 +106,8 @@ class CLuaDefs`
`106`	`106`	`{`
`107`	`107`	`// Pad functions to have the same number of parameters by`
`108`	`108`	`// filling both up to the larger number of parameters with dummy_type arguments`
`109`		`- using PaddedFunctionA = pad_func_with_func<FunctionA, FunctionB>;`
`110`		`- using PaddedFunctionB = pad_func_with_func<FunctionB, FunctionA>;`
	`109`	`+ using PaddedFunctionA = pad_func_with_func<remove_noexcept_fn_v<FunctionA>, remove_noexcept_fn_v<FunctionB>>;`
	`110`	`+ using PaddedFunctionB = pad_func_with_func<remove_noexcept_fn_v<FunctionB>, remove_noexcept_fn_v<FunctionA>>;`
`111`	`111`	`// Combine functions`
`112`	`112`	`using Overload = CLuaOverloadParser<PaddedFunctionA::Call, PaddedFunctionB::Call>;`
`113`	`113`
`@@ -118,7 +118,7 @@ class CLuaDefs`
`118`	`118`	`template <auto T>`
`119`	`119`	`static inline int ArgumentParser(lua_State* L)`
`120`	`120`	`{`
`121`		`- return CLuaFunctionParser<true, nullptr, T>()(L, m_pScriptDebugging);`
	`121`	`+ return CLuaFunctionParser<true, nullptr, remove_noexcept_fn_v<T>>()(L, m_pScriptDebugging);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`// Special case for overloads`
`@@ -128,8 +128,8 @@ class CLuaDefs`
`128`	`128`	`{`
`129`	`129`	`// Pad functions to have the same number of parameters by`
`130`	`130`	`// filling both up to the larger number of parameters with dummy_type arguments`
`131`		`- using PaddedFunctionA = pad_func_with_func<FunctionA, FunctionB>;`
`132`		`- using PaddedFunctionB = pad_func_with_func<FunctionB, FunctionA>;`
	`131`	`+ using PaddedFunctionA = pad_func_with_func<remove_noexcept_fn_v<FunctionA>, remove_noexcept_fn_v<FunctionB>>;`
	`132`	`+ using PaddedFunctionB = pad_func_with_func<remove_noexcept_fn_v<FunctionB>, remove_noexcept_fn_v<FunctionA>>;`
`133`	`133`	`// Combine functions`
`134`	`134`	`using Overload = CLuaOverloadParser<PaddedFunctionA::Call, PaddedFunctionB::Call>;`
`135`	`135`