Fixed iteration of invalid ids

Author: muit

CMake/LLVM.cmake

@@ -31,10 +31,10 @@ message(STATUS "LLVM_INCLUDE_DIRS: ${LLVM_INCLUDE_DIRS}")
 message(STATUS "LLVM_DEFINITIONS: ${LLVM_DEFINITIONS_LIST}")
 
 
-add_library(LLVM INTERFACE)
-target_include_directories(LLVM INTERFACE ${LLVM_INCLUDE_DIRS})
+add_library(RiftLLVM INTERFACE)
+target_include_directories(RiftLLVM INTERFACE ${LLVM_INCLUDE_DIRS})
 llvm_map_components_to_libnames(llvm_libs core x86asmparser x86codegen)
-target_link_libraries(LLVM INTERFACE ${LLVM_AVAILABLE_LIBS})
-target_compile_definitions(LLVM INTERFACE ${LLVM_DEFINITIONS_LIST}  -DNOMINMAX)
+target_link_libraries(RiftLLVM INTERFACE ${LLVM_AVAILABLE_LIBS})
+target_compile_definitions(RiftLLVM INTERFACE ${LLVM_DEFINITIONS_LIST}  -DNOMINMAX)
 # rift_target_disable_all_warnings(LLVM INTERFACE)
 

Libs/Backends/LLVM/CMakeLists.txt

@@ -12,7 +12,7 @@ rift_target_shared_output_directory(RiftBackendLLVM)
 
 target_link_libraries(RiftBackendLLVM PUBLIC Rift::Rift)
 
-target_link_libraries(RiftBackendLLVM PRIVATE LLVM)
+target_link_libraries(RiftBackendLLVM PRIVATE RiftLLVM)
 
 
 install(TARGETS RiftBackendLLVM

Libs/Framework/Include/AST/Pool.h

@@ -464,7 +464,7 @@ namespace Rift::AST
 
 
 	public:
-		TPool(AST::Tree& ast) : Pool(ast, DeletionPolicy::Swap) {}
+		TPool(AST::Tree& ast) : Pool(ast, DeletionPolicy::InPlace) {}
 		~TPool() override
 		{
 			Reset();

Libs/Framework/Include/AST/Types.h

@@ -126,5 +126,5 @@ namespace Rift::AST
 
 constexpr bool IsNone(Rift::AST::Id id)
 {
-	return id == Rift::AST::NoId;
+	return Rift::AST::GetVersion(id) == Rift::AST::GetVersion(Rift::AST::NoId);
 }

Libs/Framework/Src/AST/Filtering.cpp

@@ -186,7 +186,16 @@ namespace Rift::AST
 		pools.RemoveAtSwap(smallestIdx);
 
 		ids.Empty(false);
-		ids.Append(iterablePool->begin(), iterablePool->end());
+		ids.Reserve(iterablePool->Size());
+		for (AST::Id id : *iterablePool)
+		{
+			if (!IsNone(id)) [[likely]]
+			{
+				ids.Add(id);
+			}
+		}
+		// Faster but doesnt exclude invalid ids. TODO: Improve PoolSet
+		// ids.Append(iterablePool->begin(), iterablePool->end());
 
 		for (const Pool* pool : pools)
 		{