Skip to content

Fix Memory Leak Risk of Cpp Target #4330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix Memory Leak Risk of Cpp Target #4330

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cefa47a
fix memory leak risk of cpp target
wangtao9 May 26, 2023
b4ffd43
yet another way to fix cpp memory leak
wangtao9 Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tool/resources/org/antlr/v4/tool/templates/codegen/Cpp/Cpp.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ struct <lexer.name; format = "cap">StaticData final {
#if ANTLR4_USE_THREAD_LOCAL_CACHE
static thread_local
#endif
<lexer.name; format = "cap">StaticData *<lexer.grammarName; format = "lower">LexerStaticData = nullptr;
std::unique_ptr\<<lexer.name; format = "cap">StaticData> <lexer.grammarName; format = "lower">LexerStaticData = nullptr;

void <lexer.grammarName; format = "lower">LexerInitialize() {
#if ANTLR4_USE_THREAD_LOCAL_CACHE
Expand Down Expand Up @@ -175,7 +175,7 @@ void <lexer.grammarName; format = "lower">LexerInitialize() {
}
);
<atn>
<lexer.grammarName; format = "lower">LexerStaticData = staticData.release();
<lexer.grammarName; format = "lower">LexerStaticData = std::move(staticData);
}

}
Expand Down Expand Up @@ -380,7 +380,7 @@ struct <parser.name; format = "cap">StaticData final {
#if ANTLR4_USE_THREAD_LOCAL_CACHE
static thread_local
#endif
<parser.name; format = "cap">StaticData *<parser.grammarName; format = "lower">ParserStaticData = nullptr;
std::unique_ptr\<<parser.name; format = "cap">StaticData> <parser.grammarName; format = "lower">ParserStaticData = nullptr;

void <parser.grammarName; format = "lower">ParserInitialize() {
#if ANTLR4_USE_THREAD_LOCAL_CACHE
Expand All @@ -402,7 +402,7 @@ void <parser.grammarName; format = "lower">ParserInitialize() {
}
);
<atn>
<parser.grammarName; format = "lower">ParserStaticData = staticData.release();
<parser.grammarName; format = "lower">ParserStaticData = std::move(staticData);
}

}
Expand Down