diff --git a/.drone.yml b/.drone.yml index 730b094..db1d5e3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,7 @@ steps: commands: - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . -B build-release_valgrind -DSTATICC=ON -DPKMNLIB_TESTS=ON -DSHARED=ON -DSANITIZER_TESTS=OFF - cmake --build build-release_valgrind --target all -- -j 4 - - valgrind --tool=memcheck --gen-suppressions=all --leak-check=full --leak-resolution=med --track-origins=yes --vgdb=no --error-exitcode=1 build-release_valgrind/pkmnLibTests + - valgrind --tool=memcheck --gen-suppressions=all --leak-check=full --leak-resolution=med --track-origins=yes --vgdb=no --error-exitcode=1 --suppressions=angelscript.supp build-release_valgrind/pkmnLibTests - name: style-check image: deukhoofd/linux64builder failure: ignore @@ -59,6 +59,6 @@ steps: - wine64 build-release-windows/pkmnLibTests.exe -s --duration=true --force-colors=true --- kind: signature -hmac: 00bf200ae2970259d235942a21fccb4eabe2ec54aed9946e76476403eac45d9a +hmac: c069ef62b83d52f15ad57484fdf25eb359281cc9d4c6c3f8b8e38b2cfb805c44 ... diff --git a/angelscript.supp b/angelscript.supp new file mode 100644 index 0000000..5aca9c5 --- /dev/null +++ b/angelscript.supp @@ -0,0 +1,6 @@ +{ + SkipAngelScriptMemCheck + Memcheck:Cond + fun:_ZN10asCContext11ExecuteNextEv + fun:_ZN10asCContext7ExecuteEv +} diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp index 5bb4d70..e73bb9b 100644 --- a/src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp @@ -1,36 +1,37 @@ #include "ConstString.hpp" -#include #include +#include -static ArbUt::StringView* ConstructConstString() { return new ArbUt::StringView(); } -static ArbUt::StringView* ConstructConstStringFromStd(const std::string& s) { - return new ArbUt::StringView(s.c_str(), s.length()); +static void ConstructConstString(void* self) { new (self) ArbUt::StringView(); } +static void ConstructConstStringFromStd(void* self, const std::string& s) { + new (self) ArbUt::StringView(s.c_str(), s.length()); } -static ArbUt::StringView* CopyConstructConstString(ArbUt::StringView* other) { - return new ArbUt::StringView(*other); +static void CopyConstructConstString(void* self, const ArbUt::StringView& other) { + new (self) ArbUt::StringView(other); } -static void DestructConstString(ArbUt::StringView* self) { delete self; } +static void DestructConstString(void* self) { ((ArbUt::StringView*)self)->~StringView(); } static bool ConstStringEquality(const ArbUt::StringView& a, const ArbUt::StringView& b) { return a == b; } static bool ConstStringStdStringEquality(const ArbUt::StringView& a, const std::string& b) { return a == b; } static uint32_t ImplConstStringHashConv(const ArbUt::StringView& s) { return s.GetHash(); } static std::string ImplConstStringStringConv(const ArbUt::StringView& s) { return std::string(s.std_str()); } void ConstStringRegister::Register(asIScriptEngine* engine) { - auto r = engine->RegisterObjectType("constString", sizeof(ArbUt::StringView), asOBJ_SCOPED | asOBJ_REF); + auto r = engine->RegisterObjectType("constString", sizeof(ArbUt::StringView), + asOBJ_VALUE | asGetTypeTraits()); Ensure(r >= 0); - r = engine->RegisterObjectBehaviour("constString", asBEHAVE_FACTORY, "constString@ f()", - asFUNCTION(ConstructConstString), asCALL_CDECL); + r = engine->RegisterObjectBehaviour("constString", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(ConstructConstString), + asCALL_CDECL_OBJFIRST); Ensure(r >= 0); - r = engine->RegisterObjectBehaviour("constString", asBEHAVE_FACTORY, "constString@ f(const string &in s)", - asFUNCTION(ConstructConstStringFromStd), asCALL_CDECL); + r = engine->RegisterObjectBehaviour("constString", asBEHAVE_CONSTRUCT, "void f(const string &in s)", + asFUNCTION(ConstructConstStringFromStd), asCALL_CDECL_OBJFIRST); Ensure(r >= 0); - r = engine->RegisterObjectBehaviour("constString", asBEHAVE_FACTORY, "constString@ f(const constString &in)", - asFUNCTION(CopyConstructConstString), asCALL_CDECL); + r = engine->RegisterObjectBehaviour("constString", asBEHAVE_CONSTRUCT, "void f(const constString &in)", + asFUNCTION(CopyConstructConstString), asCALL_CDECL_OBJFIRST); Ensure(r >= 0); - r = engine->RegisterObjectBehaviour("constString", asBEHAVE_RELEASE, "void f()", asFUNCTION(DestructConstString), + r = engine->RegisterObjectBehaviour("constString", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(DestructConstString), asCALL_CDECL_OBJFIRST); Ensure(r >= 0);