Merge pull request #54 from UnionCompilerDesign/ir_hotfix

Ir hotfix

Author: CalebLItalien

Cargo.toml

@@ -31,3 +31,6 @@ members = [
     "./jit",
     "./logging",
 ]
+
+[build-dependencies]
+pkg-config = "0.3"

ir/README.md

@@ -16,7 +16,7 @@ The `core` submodule of the `ir` module is primarily intended for internal usage
 
 #### Creating a new Context
 ```rust
-    let ir_gen = IRGenerator::new();
+    let ir_gen = IRManager::new();
     let context_tag = ir_gen.create_context().expect("Failed to create context");
 ```
 

ir/src/block.rs

@@ -8,9 +8,9 @@ extern crate llvm_sys as llvm;
 use llvm::{core, prelude::{LLVMBasicBlockRef, LLVMBuilderRef, LLVMContextRef, LLVMValueRef}};
 use std::ffi::CString;
 use common::pointer::{LLVMRef, LLVMRefType};
-use crate::core::{BasicBlockTag, BuilderTag, ContextTag, IRGenerator, ValueTag};
+use crate::core::{BasicBlockTag, BuilderTag, ContextTag, IRManager, ValueTag};
 
-impl IRGenerator {
+impl IRManager {
     /// Creates a basic block in the specified function and context.
     ///
     /// # Parameters

ir/src/builder.rs

@@ -8,9 +8,9 @@ extern crate llvm_sys as llvm;
 use std::ffi::CString;
 use llvm::{core, prelude::LLVMBuilderRef, LLVMIntPredicate};
 use common::pointer::{LLVMRef, LLVMRefType};
-use crate::core::{BuilderTag, ContextTag, IRGenerator, ModuleTag, TypeTag, ValueTag};
+use crate::core::{BuilderTag, ContextTag, IRManager, ModuleTag, TypeTag, ValueTag};
 
-impl IRGenerator {
+impl IRManager {
     /// Allocates a builder in a specified context and stores it in the resource pool.
     ///
     /// # Parameters

ir/src/core.rs

@@ -17,17 +17,17 @@ pub struct EnumDefinition {
 }
 
 /// Tag associated with an LLVM Context.
-/// Provides access to stored context resources within the IRGenerator pools.
+/// Provides access to stored context resources within the IRManager pools.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct ContextTag(usize);
 
 /// Tag associated with an LLVM Module.
-/// Allows for retrieval and management of module resources in the IRGenerator pools.
+/// Allows for retrieval and management of module resources in the IRManager pools.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct ModuleTag(usize);
 
 /// Tag associated with an LLVM Value.
-/// Used for accessing and manipulating value resources in the IRGenerator pools.
+/// Used for accessing and manipulating value resources in the IRManager pools.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct ValueTag(usize);
 
@@ -37,12 +37,12 @@ pub struct ValueTag(usize);
 pub struct BasicBlockTag(usize);
 
 /// Tag associated with an LLVM Builder.
-/// Used to access builder resources stored within the IRGenerator pools.
+/// Used to access builder resources stored within the IRManager pools.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct BuilderTag(usize);
 
 /// Tag associated with an LLVM Type.
-/// Enables the handling and retrieval of type resources from the IRGenerator pools.
+/// Enables the handling and retrieval of type resources from the IRManager pools.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct TypeTag(usize);
 
@@ -89,10 +89,10 @@ impl EnumDefinition {
 }
 
 
-/// Enum representing unique tags for various types of LLVM objects managed within the IRGenerator.
+/// Enum representing unique tags for various types of LLVM objects managed within the IRManager.
 /// Each tag is unique and provides a way to retrieve specific LLVM objects from internal resource pools.
 pub enum Tag {
-    /// Tag for identifying and retrieving LLVM `Context` objects from the IRGenerator's resource pools.
+    /// Tag for identifying and retrieving LLVM `Context` objects from the IRManager's resource pools.
     /// Contexts represent environments in which LLVM IR generation and manipulation occur.
     Context(ContextTag),
 
@@ -119,7 +119,7 @@ pub enum Tag {
 }
 
 /// Core structure for managing IR generation. This includes creation, storage, and retrieval of LLVM related objects.
-pub struct IRGenerator {
+pub struct IRManager {
     contexts: Option<HashMap<ContextTag, Arc<RwLock<SafeLLVMPointer>>>>,
     modules: Option<HashMap<ModuleTag, Arc<RwLock<SafeLLVMPointer>>>>,
     values: Option<HashMap<ValueTag, Arc<RwLock<SafeLLVMPointer>>>>,
@@ -131,11 +131,11 @@ pub struct IRGenerator {
     next_tag: usize,
 }
 
-impl IRGenerator {
-    /// Constructs a new instance of `IRGenerator`.
+impl IRManager {
+    /// Constructs a new instance of `IRManager`.
     ///
     /// # Returns
-    /// A new `IRGenerator` instance with empty pools and a tag counter initialized to zero.
+    /// A new `IRManager` instance with empty pools and a tag counter initialized to zero.
     pub fn new() -> Self {
         Self {
             contexts: None,

ir/src/types.rs

@@ -7,9 +7,9 @@ extern crate llvm_sys as llvm;
 use std::collections::HashMap;
 use llvm::{core, prelude::LLVMTypeRef};
 use common::pointer::{LLVMRef, LLVMRefType};
-use super::core::{EnumDefinition, BuilderTag, ContextTag, IRGenerator, TypeTag, ValueTag};
+use super::core::{EnumDefinition, BuilderTag, ContextTag, IRManager, TypeTag, ValueTag};
 
-impl IRGenerator {
+impl IRManager {
     /// Returns the LLVM type for void in a specified context.
     ///
     /// # Parameters

ir/src/values.rs

@@ -7,9 +7,9 @@ extern crate llvm_sys as llvm;
 use llvm::core;
 use std::ffi::CString;
 use common::pointer::{LLVMRef, LLVMRefType};
-use super::core::{BasicBlockTag, BuilderTag, ContextTag, IRGenerator, TypeTag, ValueTag};
+use super::core::{BasicBlockTag, BuilderTag, ContextTag, IRManager, TypeTag, ValueTag};
 
-impl IRGenerator {
+impl IRManager {
     /// Creates a 64-bit integer constant in a specified context.
     ///
     /// # Parameters

ir/src/variables.rs

@@ -7,9 +7,9 @@ extern crate llvm_sys as llvm;
 use llvm::core;
 use std::ffi::CString;
 use common::pointer::{LLVMRef, LLVMRefType};
-use super::core::{BuilderTag, IRGenerator, TypeTag, ValueTag};
+use super::core::{BuilderTag, IRManager, TypeTag, ValueTag};
 
-impl IRGenerator {
+impl IRManager {
     /// Initializes a variable with an optional initial value in the specified builder context.
     ///
     /// # Parameters

ir/tests/block_tests.rs

@@ -1,10 +1,10 @@
 use analysis::validator::Validator;
 use common::constants::{DEFAULT_BASIC_BLOCK_NAME, DEFAULT_FUNCTION_NAME, DEFAULT_MODULE_NAME};
-use ir::core::IRGenerator;
+use ir::core::IRManager;
 
 #[test]
 fn test_create_basic_block() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag = resource_pools.create_context().expect("Failed to create context");
     let module_tag = resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -39,7 +39,7 @@ fn test_create_basic_block() {
 
 #[test]
 fn test_get_current_block() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag = resource_pools.create_context().expect("Failed to create context");
     let module_tag = resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -72,7 +72,7 @@ fn test_get_current_block() {
 
 #[test]
 fn test_get_next_and_previous_block() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag = resource_pools.create_context().expect("Failed to create context");
     let module_tag = resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -92,7 +92,7 @@ fn test_get_next_and_previous_block() {
 
 #[test]
 fn test_create_after_block() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag = resource_pools.create_context().expect("Failed to create context");
     let module_tag = resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -120,7 +120,7 @@ fn test_create_after_block() {
 
 #[test]
 fn test_create_cond_br() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag =  resource_pools.create_context().expect("Failed to create context");
     let module_tag =  resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -159,7 +159,7 @@ fn test_create_cond_br() {
 
 #[test]
 fn test_create_br() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag =  resource_pools.create_context().expect("Failed to create context");
     let module_tag =  resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -199,7 +199,7 @@ fn test_create_br() {
 
 #[test]
 fn test_insert_before_basic_block() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag =  resource_pools.create_context().expect("Failed to create context");
     let module_tag =  resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");    let function_type = resource_pools.void_type(context_tag).expect("Failed to create function type");
@@ -238,7 +238,7 @@ fn test_insert_before_basic_block() {
 
 #[test]
 fn test_position_builder_at_end() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag = resource_pools.create_context().expect("Failed to create context");
     let module_tag = resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -275,7 +275,7 @@ fn test_position_builder_at_end() {
 
 #[test]
 fn test_delete_basic_block() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag = resource_pools.create_context().expect("Failed to create context");
     let module_tag = resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -312,7 +312,7 @@ fn test_delete_basic_block() {
 
 #[test]
 fn test_get_first_instruction() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag = resource_pools.create_context().expect("Failed to create context");
     let module_tag = resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");
@@ -348,7 +348,7 @@ fn test_get_first_instruction() {
 
 #[test]
 fn test_get_last_instruction() {
-    let mut resource_pools = IRGenerator::new();
+    let mut resource_pools = IRManager::new();
 
     let context_tag = resource_pools.create_context().expect("Failed to create context");
     let module_tag = resource_pools.create_module(DEFAULT_MODULE_NAME, context_tag).expect("Failed to create module within context");

ir/tests/builder_tests.rs

@@ -1,10 +1,10 @@
 use analysis::validator::Validator;
 use common::constants::{DEFAULT_BASIC_BLOCK_NAME, DEFAULT_FUNCTION_NAME};
-use ir::core::{IRGenerator, TypeTag};
+use ir::core::{IRManager, TypeTag};
 
 #[test]
 fn test_builder_creation() {
-    let mut llvm_resource_pool = IRGenerator::new();
+    let mut llvm_resource_pool = IRManager::new();
     let context_tag = llvm_resource_pool.create_context()
         .expect("Failed to create context");
 
@@ -14,7 +14,7 @@ fn test_builder_creation() {
 
 #[test]
 fn test_create_function_no_params_void_return() {
-    let mut llvm_resource_pool = IRGenerator::new();
+    let mut llvm_resource_pool = IRManager::new();
 
     let context_tag = llvm_resource_pool.create_context().expect("Failed to create context");
     let module_tag = llvm_resource_pool.create_module("test_module", context_tag).expect("Failed to create module");
@@ -46,7 +46,7 @@ fn test_create_function_no_params_void_return() {
 }
 #[test]
 fn test_create_function_with_params() {
-    let mut llvm_resource_pool = IRGenerator::new();
+    let mut llvm_resource_pool = IRManager::new();
     let context_tag = llvm_resource_pool.create_context().expect("Failed to create context");
     let module_tag = llvm_resource_pool.create_module("test_module_with_params", context_tag).expect("Failed to create module");
     let int_type_tag = llvm_resource_pool.int_type(context_tag, 32).expect("Failed to create integer type");