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

Switch to std::unique_ptr, no need for refcounting

Browse source
This commit is contained in:
Arseny Kapoulkine 2022-08-23 11:17:43 -07:00
parent 176e0add87
commit 1be19b5248
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Compiler/src/Compiler.cpp
View file

@ -15,6 +15,7 @@
#include <algorithm> #include <algorithm>
#include <bitset> #include <bitset>
#include <memory> #include <memory>
#include <math.h> #include <math.h>
LUAU_FASTINTVARIABLE(LuauCompileLoopUnrollThreshold, 25) LUAU_FASTINTVARIABLE(LuauCompileLoopUnrollThreshold, 25)
@ -1627,11 +1628,11 @@ struct Compiler
// We can't use formatStringRef.data() directly, because short strings don't have their data // We can't use formatStringRef.data() directly, because short strings don't have their data
// pinned in memory, so when interpFormatStrings grows, these pointers will move and become invalid. // pinned in memory, so when interpFormatStrings grows, these pointers will move and become invalid.
std::shared_ptr<char[]> formatStringPtr(new char[formatStringSize]); std::unique_ptr<char[]> formatStringPtr(new char[formatStringSize]);
memcpy(formatStringPtr.get(), formatString.data(), formatStringSize); memcpy(formatStringPtr.get(), formatString.data(), formatStringSize);
interpFormatStrings.emplace_back(formatStringPtr);
AstArray<char> formatStringArray{formatStringPtr.get(), formatStringSize}; AstArray<char> formatStringArray{formatStringPtr.get(), formatStringSize};
interpStrings.emplace_back(std::move(formatStringPtr)); // invalidates formatStringPtr, but keeps formatStringArray intact
int32_t formatStringIndex = bytecode.addConstantString(sref(formatStringArray)); int32_t formatStringIndex = bytecode.addConstantString(sref(formatStringArray));
if (formatStringIndex < 0) if (formatStringIndex < 0)
@ -3885,7 +3886,7 @@ struct Compiler
std::vector<Loop> loops; std::vector<Loop> loops;
std::vector<InlineFrame> inlineFrames; std::vector<InlineFrame> inlineFrames;
std::vector<Capture> captures; std::vector<Capture> captures;
std::vector<std::shared_ptr<char[]>> interpFormatStrings; std::vector<std::unique_ptr<char[]>> interpStrings;
}; };
void compileOrThrow(BytecodeBuilder& bytecode, const ParseResult& parseResult, const AstNameTable& names, const CompileOptions& inputOptions) void compileOrThrow(BytecodeBuilder& bytecode, const ParseResult& parseResult, const AstNameTable& names, const CompileOptions& inputOptions)