21053: Code cleanup

howsoai · Jul 26, 2024 · e8d094f · e8d094f
1 parent 87f63ec
commit e8d094f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/src/Amalgam/evaluablenode/EvaluableNode.cpp b/src/Amalgam/evaluablenode/EvaluableNode.cpp
@@ -1565,8 +1565,7 @@ void EvaluableNode::DestructValue()
 void EvaluableNode::Invalidate()
 {
 #ifdef AMALGAM_FAST_MEMORY_INTEGRITY
-	if(IsNodeDeallocated())
-		assert(false);
+	assert(!IsNodeDeallocated());
 #endif
 
 	if(!HasExtendedValue())

diff --git a/src/Amalgam/evaluablenode/EvaluableNode.h b/src/Amalgam/evaluablenode/EvaluableNode.h
@@ -419,13 +419,10 @@ class EvaluableNode
 	static size_t GetEstimatedNodeSizeInBytes(EvaluableNode *n);
 
 	//gets current type
-	constexpr EvaluableNodeType &GetType()
+	__forceinline EvaluableNodeType &GetType()
 	{
 	#ifdef AMALGAM_FAST_MEMORY_INTEGRITY
-		if(type == ENT_DEALLOCATED)
-		{
-			assert(false);
-		}
+		assert(type != ENT_DEALLOCATED);
 	#endif
 		return type;
 	}

diff --git a/src/Amalgam/evaluablenode/EvaluableNodeManagement.h b/src/Amalgam/evaluablenode/EvaluableNodeManagement.h
@@ -205,10 +205,7 @@ class EvaluableNodeStackStateSaver
 		originalStackSize = stack->size();
 
 	#ifdef AMALGAM_FAST_MEMORY_INTEGRITY
-		if(initial_element != nullptr && initial_element->IsNodeDeallocated())
-		{
-			assert(false);
-		}
+		assert(initial_element == nullptr || !initial_element->IsNodeDeallocated());
 	#endif
 
 		stack->push_back(initial_element);
@@ -222,10 +219,7 @@ class EvaluableNodeStackStateSaver
 	__forceinline void PushEvaluableNode(EvaluableNode *n)
 	{
 	#ifdef AMALGAM_FAST_MEMORY_INTEGRITY
-		if(n != nullptr && n->IsNodeDeallocated())
-		{
-			assert(false);
-		}
+		assert(n == nullptr || !n->IsNodeDeallocated());
 	#endif
 		stack->push_back(n);
 	}
@@ -245,10 +239,7 @@ class EvaluableNodeStackStateSaver
 	__forceinline void SetStackLocation(size_t location, EvaluableNode *new_value)
 	{
 	#ifdef AMALGAM_FAST_MEMORY_INTEGRITY
-		if(new_value != nullptr && new_value->IsNodeDeallocated())
-		{
-			assert(false);
-		}
+		assert(new_value == nullptr || !new_value->IsNodeDeallocated());
 	#endif
 		(*stack)[location] = new_value;
 	}