lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #5763 from yorickvP/evalstate-root

Browse source 
EvalCommand::getEvalState: use gc tracable allocator for EvalState (fix segfault)
This commit is contained in:
Eelco Dolstra 2021-12-13 13:37:17 +01:00 committed by GitHub
parent f24ac3115f 33e96820d5
commit ec33014e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libcmd/command.cc
View file

@ -73,8 +73,13 @@ ref<Store> EvalCommand::getEvalStore()
ref<EvalState> EvalCommand::getEvalState() ref<EvalState> EvalCommand::getEvalState()
{ {
if (!evalState) if (!evalState) evalState =
evalState = std::make_shared<EvalState>(searchPath, getEvalStore(), getStore()); #if HAVE_BOEHMGC
std::allocate_shared<EvalState>(traceable_allocator<EvalState>(),
#else
std::make_shared<EvalState>(
#endif
searchPath, getEvalStore(), getStore());
return ref<EvalState>(evalState); return ref<EvalState>(evalState);
} }