GPU: Fix - do not check stack tag protection when stack is disabled for display

davidrohr · davidrohr · commit 9d23dc583878 · 2021-03-06T19:54:39.000+01:00
diff --git a/GPU/GPUTracking/Base/GPUReconstruction.cxx b/GPU/GPUTracking/Base/GPUReconstruction.cxx
@@ -733,6 +733,12 @@ void GPUReconstruction::PushNonPersistentMemory(unsigned long tag)
 
 void GPUReconstruction::PopNonPersistentMemory(RecoStep step, unsigned long tag)
 {
+  if (mProcessingSettings.keepDisplayMemory || mProcessingSettings.disableMemoryReuse) {
+    return;
+  }
+  if (mNonPersistentMemoryStack.size() == 0) {
+    GPUFatal("Trying to pop memory state from empty stack");
+  }
   if (tag != 0 && std::get<3>(mNonPersistentMemoryStack.back()) != tag) {
     GPUFatal("Tag mismatch when poping non persistent memory from stack : pop %s vs on stack %s", qTag2Str(tag).c_str(), qTag2Str(std::get<3>(mNonPersistentMemoryStack.back())).c_str());
   }
@@ -744,9 +750,6 @@ void GPUReconstruction::PopNonPersistentMemory(RecoStep step, unsigned long tag)
     printf("%16s", "");
     PrintMemoryMax();
   }
-  if (mProcessingSettings.keepDisplayMemory || mProcessingSettings.disableMemoryReuse) {
-    return;
-  }
   mHostMemoryPoolEnd = std::get<0>(mNonPersistentMemoryStack.back());
   mDeviceMemoryPoolEnd = std::get<1>(mNonPersistentMemoryStack.back());
   for (unsigned int i = std::get<2>(mNonPersistentMemoryStack.back()); i < mNonPersistentIndividualAllocations.size(); i++) {
