zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-18 01:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- do not delete the namespaces when removing compiler symbols. They still get referenced by some types and must remain until the engine shuts down.

Browse source
This commit is contained in:
Christoph Oelckers 2017-04-14 19:40:50 +02:00
parent 7186342221
commit d014395dae
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dobjtype.cpp
View file

@ -267,6 +267,7 @@ void PClass::StaticShutdown ()
{ {
p.PendingWeapon = nullptr; p.PendingWeapon = nullptr;
} }
Namespaces.ReleaseSymbols();
// This must be done in two steps because the native classes are not ordered by inheritance, // This must be done in two steps because the native classes are not ordered by inheritance,
// so all meta data must be gone before deleting the actual class objects. // so all meta data must be gone before deleting the actual class objects.
@ -275,7 +276,6 @@ void PClass::StaticShutdown ()
// Unless something went wrong, anything left here should be class and type objects only, which do not own any scripts. // Unless something went wrong, anything left here should be class and type objects only, which do not own any scripts.
bShutdown = true; bShutdown = true;
TypeTable.Clear(); TypeTable.Clear();
Namespaces.ReleaseSymbols();
ClassDataAllocator.FreeAllBlocks(); ClassDataAllocator.FreeAllBlocks();
AllClasses.Clear(); AllClasses.Clear();
PClassActor::AllActorClasses.Clear(); PClassActor::AllActorClasses.Clear();

10
src/scripting/symbols.cpp
View file

@ -512,13 +512,16 @@ PNamespace *FNamespaceManager::NewNamespace(int filenum)
//========================================================================== //==========================================================================
// //
// // Deallocate the entire namespace manager.
// //
//========================================================================== //==========================================================================
void FNamespaceManager::ReleaseSymbols() void FNamespaceManager::ReleaseSymbols()
{ {
RemoveSymbols(); for (auto ns : AllNamespaces)
{
delete ns;
}
GlobalNamespace = nullptr; GlobalNamespace = nullptr;
AllNamespaces.Clear(); AllNamespaces.Clear();
} }
@ -537,7 +540,7 @@ int FNamespaceManager::RemoveSymbols()
for (auto ns : AllNamespaces) for (auto ns : AllNamespaces)
{ {
count += ns->Symbols.Symbols.CountUsed(); count += ns->Symbols.Symbols.CountUsed();
delete ns; ns->Symbols.ReleaseSymbols();
} }
return count; return count;
} }
@ -550,7 +553,6 @@ int FNamespaceManager::RemoveSymbols()
void RemoveUnusedSymbols() void RemoveUnusedSymbols()
{ {
// Global symbols are not needed anymore after running the compiler.
int count = Namespaces.RemoveSymbols(); int count = Namespaces.RemoveSymbols();
// We do not need any non-field and non-function symbols in structs and classes anymore. // We do not need any non-field and non-function symbols in structs and classes anymore.