diff --git a/cir/Cargo.toml b/cir/Cargo.toml index 174fd66..0047526 100644 --- a/cir/Cargo.toml +++ b/cir/Cargo.toml @@ -13,7 +13,7 @@ exclude = [ "/tests" ] clap = { version = "4.5", features = [ "derive" ] } toml = "0.8" itertools = "0.13" -bitflags = "2.5" +bitflags = "2.6" num-integer = "0.1" terminal_size = "0.3" log = "0.4" diff --git a/irp/Cargo.toml b/irp/Cargo.toml index 39552c5..5e32fbc 100644 --- a/irp/Cargo.toml +++ b/irp/Cargo.toml @@ -21,7 +21,7 @@ log = "0.4" peg = "0.8" itertools = "0.13" num-rational = "0.4" -inkwell = { version = "0.4", features = [ "target-bpf", "llvm15-0-force-dynamic" ], optional = true } +inkwell = { version = "0.5", features = [ "target-bpf", "llvm15-0-force-dynamic" ], optional = true } [features] bpf = [ "inkwell" ] diff --git a/irp/src/build_bpf.rs b/irp/src/build_bpf.rs index 3a37c97..e70279c 100644 --- a/irp/src/build_bpf.rs +++ b/irp/src/build_bpf.rs @@ -47,10 +47,7 @@ impl DFA { builder, vars, decoder_state_ty, - decoder_state: context - .bool_type() - .ptr_type(AddressSpace::default()) - .const_null(), + decoder_state: context.ptr_type(AddressSpace::default()).const_null(), }; builder.define_function_body(map, &context); @@ -156,8 +153,8 @@ impl<'a> Builder<'a> { fn define_function_body(&mut self, map_def: GlobalValue<'a>, context: &'a Context) { let i32 = context.i32_type(); let i64 = context.i64_type(); - let i32_ptr = context.i32_type().ptr_type(AddressSpace::default()); - let i64_ptr = context.i64_type().ptr_type(AddressSpace::default()); + let i32_ptr = context.ptr_type(AddressSpace::default()); + let i64_ptr = context.ptr_type(AddressSpace::default()); let entry = context.append_basic_block(self.function, "entry"); self.builder.position_at_end(entry); @@ -1271,7 +1268,7 @@ fn define_function<'ctx>( name: &'ctx str, ) -> FunctionValue<'ctx> { let i32 = context.i32_type(); - let i32_ptr = context.i32_type().ptr_type(AddressSpace::default()); + let i32_ptr = context.ptr_type(AddressSpace::default()); let fn_type = i32.fn_type(&[i32_ptr.into()], false);