Merge pull request #1835 from wannacu/main

AOTIR: Fix IRList delete
FEX-Emu · Jul 7, 2022 · fb41ba1 · fb41ba1
2 parents aec5b21 + 227462e
commit fb41ba1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/External/FEXCore/Source/Interface/IR/AOTIR.cpp b/External/FEXCore/Source/Interface/IR/AOTIR.cpp
@@ -360,7 +360,7 @@ namespace FEXCore::IR {
         else {
           // If the IR doesn't need to be retained then we can just delete it now
           delete DebugData;
-          delete IRList;
+          if (IRList->IsCopy()) delete IRList;
         }
       }
     }

diff --git a/External/FEXCore/include/FEXCore/IR/IntrusiveIRList.h b/External/FEXCore/include/FEXCore/IR/IntrusiveIRList.h
@@ -181,7 +181,7 @@ class IRListView final {
     //size_t ListSize;
     stream.write((const char*)&ListSize, sizeof(ListSize));
     //uint64_t Flags;
-    uint64_t WrittenFlags = Flags | FLAG_Shared; //on disk format always has the Shared flag
+    uint64_t WrittenFlags = FLAG_Shared; //on disk format always has the Shared flag
     stream.write((const char*)&WrittenFlags, sizeof(WrittenFlags));
 
     // inline data
@@ -200,7 +200,7 @@ class IRListView final {
     //size_t ListSize;
     memcpy(ptr, &ListSize, sizeof(ListSize)); ptr += sizeof(ListSize);
     //uint64_t Flags;
-    uint64_t WrittenFlags = Flags | FLAG_Shared; //on disk format always has the Shared flag
+    uint64_t WrittenFlags = FLAG_Shared; //on disk format always has the Shared flag
     memcpy(ptr, &WrittenFlags, sizeof(WrittenFlags)); ptr += sizeof(WrittenFlags);
 
     // inline data