From 0da4dbf2f2b051958236bf315fb032b8c539c70d Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Mon, 20 Jan 2025 13:00:35 +0800 Subject: [PATCH] Update to llvmlite v0.44 as in MSYS2 packages Signed-off-by: Egor Savkin --- artiq/compiler/transforms/llvm_ir_generator.py | 6 +++--- flake.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py index 28d24dffe..cd21f4424 100644 --- a/artiq/compiler/transforms/llvm_ir_generator.py +++ b/artiq/compiler/transforms/llvm_ir_generator.py @@ -146,9 +146,9 @@ class ABILayoutInfo: @memoize def get_size_align(self, llty): - lowered = llty._get_ll_pointer_type(self.lldatalayout, self.llcontext) - return (self.lldatalayout.get_pointee_abi_size(lowered), - self.lldatalayout.get_pointee_abi_alignment(lowered)) + lowered = llty._get_ll_global_value_type(self.lldatalayout, self.llcontext) + return (self.lldatalayout.get_abi_size(lowered), + self.lldatalayout.get_abi_alignment(lowered)) @memoize def get_size_align_for_type(self, typ): diff --git a/flake.nix b/flake.nix index e1ba24489..5aa14ec50 100644 --- a/flake.nix +++ b/flake.nix @@ -149,12 +149,12 @@ llvmlite-new = pkgs.python3Packages.buildPythonPackage rec { pname = "llvmlite"; - version = "0.43.0"; + version = "0.44.0"; src = pkgs.fetchFromGitHub { owner = "numba"; repo = "llvmlite"; rev = "v${version}"; - sha256 = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o="; + sha256 = "sha256-ZIA/JfK9ZP00Zn6SZuPus30Xw10hn3DArHCkzBZAUV0="; }; nativeBuildInputs = [pkgs.llvm_15]; # Disable static linking