[Git][reproducible-builds/diffoscope][master] Fix compatibility with llvm 22

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
6ea43da2 by Jelle van der Waa at 2026-03-29T16:53:00+02:00
Fix compatibility with llvm 22

- - - - -


2 changed files:

- tests/comparators/test_rlib.py
- + tests/data/rlib_llvm_dis_expected_diff_22


Changes:

=====================================
tests/comparators/test_rlib.py
=====================================
@@ -91,6 +91,9 @@ def rlib_dis_expected_diff():
     if actual_ver >= "21.0":
         diff_file = "rlib_llvm_dis_expected_diff_21"
 
+    if actual_ver >= "22.0":
+        diff_file = "rlib_llvm_dis_expected_diff_22"
+
     return get_data(diff_file)
 
 


=====================================
tests/data/rlib_llvm_dis_expected_diff_22
=====================================
@@ -0,0 +1,36 @@
+@@ -42,32 +42,32 @@
+ entry-block:
+   %out.i.i = alloca ptr, align 8
+   %4 = icmp ult i64 %3, 17
+   br i1 %4, label %then-block-195-.i, label %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i
+ 
+ then-block-195-.i:                                ; preds = %entry-block
+   %5 = tail call ptr @realloc(ptr %0, i64 %2) #2
+-  br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
++  br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
+ 
+ _ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i: ; preds = %entry-block
+   %6 = bitcast ptr %out.i.i to ptr
+   call void @llvm.lifetime.start.p0(ptr %out.i.i)
+   store ptr null, ptr %out.i.i, align 8
+   %7 = call i32 @posix_memalign(ptr nonnull %out.i.i, i64 %3, i64 %2) #2
+   %8 = icmp eq i32 %7, 0
+   %9 = load ptr, ptr %out.i.i, align 8
+   %sret_slot.0.i.i = select i1 %8, ptr %9, ptr null
+   call void @llvm.lifetime.end.p0(ptr %out.i.i)
+   %10 = icmp ule i64 %2, %1
+   %11 = select i1 %10, i64 %2, i64 %1
+   call void @llvm.memmove.p0.p0.i64(ptr align 1 %sret_slot.0.i.i, ptr align 1 %0, i64 %11, i1 false) #2
+   call void @free(ptr %0) #2
+-  br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
++  br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
+ 
+-_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
++_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
+   %sret_slot.0.i = phi ptr [ %5, %then-block-195-.i ], [ %sret_slot.0.i.i, %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i ]
+   ret ptr %sret_slot.0.i
+ }
+ 
+ ; Function Attrs: nounwind memory(none) uwtable
+ define i64 @__rust_reallocate_inplace(ptr readnone captures(none) %0, i64 %1, i64 %2, i64 %3) unnamed_addr #1 {
+ entry-block:



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/6ea43da25223ceef94032a7e10dab77ba6be6a48

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/6ea43da25223ceef94032a7e10dab77ba6be6a48
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20260330/fe866ac0/attachment.htm>