Remove utils since all iterators were upstreamed

Signed-off-by: Alex Saveau <[email protected]>
jamesmth · Feb 2, 2024 · de1975b · de1975b
1 parent 7fe29ca
commit de1975b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 98 deletions.
diff --git a/examples/opcode_counter.rs b/examples/opcode_counter.rs
@@ -4,7 +4,6 @@
 use std::collections::HashMap;
 
 use llvm_plugin::inkwell::values::{FunctionValue, InstructionOpcode};
-use llvm_plugin::utils::InstructionIterator;
 use llvm_plugin::{
     AnalysisKey, FunctionAnalysisManager, LlvmFunctionAnalysis, LlvmFunctionPass, PassBuilder,
     PipelineParsing, PreservedAnalyses,
@@ -57,7 +56,7 @@ impl LlvmFunctionAnalysis for OpcodeCounterAnalysis {
         let mut opcode_map = HashMap::new();
 
         for bb in function.get_basic_blocks() {
-            for instr in InstructionIterator::new(&bb) {
+            for instr in bb.get_instructions() {
                 opcode_map
                     .entry(instr.get_opcode())
                     .and_modify(|e| *e += 1)

diff --git a/examples/static_call_counter.rs b/examples/static_call_counter.rs
@@ -7,7 +7,6 @@ use either::Either;
 
 use llvm_plugin::inkwell::module::Module;
 use llvm_plugin::inkwell::values::{BasicValueEnum, InstructionOpcode};
-use llvm_plugin::utils::InstructionIterator;
 use llvm_plugin::{
     AnalysisKey, LlvmModuleAnalysis, LlvmModulePass, ModuleAnalysisManager, PassBuilder,
     PipelineParsing, PreservedAnalyses,
@@ -47,7 +46,7 @@ impl LlvmModuleAnalysis for StaticCallCounterAnalysis {
 
         for func in module.get_functions() {
             for bb in func.get_basic_blocks() {
-                for instr in InstructionIterator::new(&bb) {
+                for instr in bb.get_instructions() {
                     if !matches!(instr.get_opcode(), InstructionOpcode::Call) {
                         continue;
                     }

diff --git a/examples/strings.rs b/examples/strings.rs
@@ -7,7 +7,6 @@ use llvm_plugin::inkwell::basic_block::BasicBlock;
 use llvm_plugin::inkwell::module::{Linkage, Module};
 use llvm_plugin::inkwell::values::{BasicValueEnum, FunctionValue, GlobalValue};
 use llvm_plugin::inkwell::{AddressSpace, IntPredicate};
-use llvm_plugin::utils::GlobalIterator;
 use llvm_plugin::{
     LlvmModulePass, ModuleAnalysisManager, PassBuilder, PipelineParsing, PreservedAnalyses,
 };
@@ -59,7 +58,7 @@ fn encode_global_strings<'a>(module: &mut Module<'a>) -> Vec<GlobalString<'a>> {
     let mut global_strings = Vec::new();
     let cx = module.get_context();
 
-    for global in GlobalIterator::new(module) {
+    for global in module.get_globals() {
         // ignore external globals
         if matches!(global.get_linkage(), Linkage::External) {
             continue;

diff --git a/llvm-plugin/src/lib.rs b/llvm-plugin/src/lib.rs
@@ -117,9 +117,6 @@ pub use pass_manager::*;
 mod pass_builder;
 pub use pass_builder::*;
 
-/// Utilities.
-pub mod utils;
-
 /// Enum specifying whether analyses on an IR unit are not preserved due
 /// to the modification of such unit by a transformation pass.
 #[repr(C)]

diff --git a/llvm-plugin/src/utils.rs b/llvm-plugin/src/utils.rs
diff --git a/tests/plugins/plugin5/src/lib.rs b/tests/plugins/plugin5/src/lib.rs
@@ -1,7 +1,6 @@
 use llvm_plugin::inkwell::basic_block::BasicBlock;
 use llvm_plugin::inkwell::module::Module;
 use llvm_plugin::inkwell::values::{FunctionValue, InstructionOpcode, InstructionValue};
-use llvm_plugin::utils::FunctionIterator;
 use llvm_plugin::{
     AnalysisKey, FunctionAnalysisManager, LlvmFunctionAnalysis, LlvmFunctionPass, LlvmModulePass,
     ModuleAnalysisManager, PassBuilder, PipelineParsing, PreservedAnalyses,
@@ -39,7 +38,7 @@ impl LlvmModulePass for Pass1 {
             .get_function_analysis_manager_proxy(&module)
             .get_manager();
 
-        for function in FunctionIterator::new(module) {
+        for function in module.get_functions() {
             let result = manager.get_cached_result::<Ana1>(&function);
             assert!(result.is_none());