21053: Adds additional debugging capabilities related to AMALGAM_FAST_MEMORY_INTEGRITY and catching asserts

src/Amalgam/PlatformSpecific.h

@@ -223,23 +223,19 @@ inline void Platform_Assert(bool expr, const char *file, int line)
 		std::cerr << "Runtime Exception: Debug Assertion Failed at line " << line << " of " << file << "\n";
 
 	//platform dependent assertion function
-	#ifdef _DEBUG
-
-		#ifdef OS_WINDOWS
-			_ASSERT(expr);
-		#else
-			raise(SIGTRAP);
-		#endif
-			exit(-1);
-
+	#ifdef OS_WINDOWS
+		_ASSERT(expr);
 	#else
-		if(Platform_IsDebuggerPresent())
-		{
-			//wait for user input
-			std::string temp;
-			std::getline(std::cin, temp);
-		}
-		exit(-1);
+		raise(SIGTRAP);
 	#endif
+
+	if(Platform_IsDebuggerPresent())
+	{
+		//wait for user input in case the _ASSERT above was optimized out
+		std::string temp;
+		std::getline(std::cin, temp);
+	}
+
+	exit(-1);
 	}
 }

src/Amalgam/evaluablenode/EvaluableNodeManagement.h

@@ -204,6 +204,13 @@ class EvaluableNodeStackStateSaver
 		stack = _stack;
 		originalStackSize = stack->size();
 
+	#ifdef AMALGAM_FAST_MEMORY_INTEGRITY
+		if(initial_element != nullptr && initial_element->IsNodeDeallocated())
+		{
+			assert(false);
+		}
+	#endif
+
 		stack->push_back(initial_element);
 	}
 
@@ -214,6 +221,12 @@ class EvaluableNodeStackStateSaver
 
 	__forceinline void PushEvaluableNode(EvaluableNode *n)
 	{
+	#ifdef AMALGAM_FAST_MEMORY_INTEGRITY
+		if(n != nullptr && n->IsNodeDeallocated())
+		{
+			assert(false);
+		}
+	#endif
 		stack->push_back(n);
 	}
 
@@ -231,6 +244,12 @@ class EvaluableNodeStackStateSaver
 	//replaces the position of the stack with new_value
 	__forceinline void SetStackLocation(size_t location, EvaluableNode *new_value)
 	{
+	#ifdef AMALGAM_FAST_MEMORY_INTEGRITY
+		if(new_value != nullptr && new_value->IsNodeDeallocated())
+		{
+			assert(false);
+		}
+	#endif
 		(*stack)[location] = new_value;
 	}