diff options
| author | Jay Petacat <jay@jayschwa.net> | 2024-09-09 22:23:18 -0600 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-09-16 14:04:18 -0700 |
| commit | 812557bfde3c577b5f00cb556201c71ad5ed6fa4 (patch) | |
| tree | 78dc955c7aa665ea95f32a3820903f63c025aed7 /lib/std/debug/SelfInfo.zig | |
| parent | 7caa3d9da71c38665340247a1c2bf9bedb8db925 (diff) | |
| download | zig-812557bfde3c577b5f00cb556201c71ad5ed6fa4.tar.gz zig-812557bfde3c577b5f00cb556201c71ad5ed6fa4.zip | |
std: Restore conventional `compareFn` behavior for `binarySearch`
PR #20927 made some improvements to the `binarySearch` API, but one
change I found surprising was the relationship between the left-hand and
right-hand parameters of `compareFn` was inverted. This is different
from how comparison functions typically behave, both in other parts of
Zig (e.g. `std.math.order`) and in other languages (e.g. C's `bsearch`).
Unless a strong reason can be identified and documented for doing
otherwise, I think it'll be better to stick with convention.
While writing this patch and changing things back to the way they were,
the predicates of `lowerBound` and `upperBound` seemed to be the only
areas that benefited from the inversion. I don't think that benefit is
worth the cost, personally. Calling `Order.invert()` in the predicates
accomplishes the same goal.
Diffstat (limited to 'lib/std/debug/SelfInfo.zig')
| -rw-r--r-- | lib/std/debug/SelfInfo.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/debug/SelfInfo.zig b/lib/std/debug/SelfInfo.zig index 76c0505e96..5e9afc8cfd 100644 --- a/lib/std/debug/SelfInfo.zig +++ b/lib/std/debug/SelfInfo.zig @@ -1624,12 +1624,12 @@ pub fn unwindFrameDwarf( } else { const index = std.sort.binarySearch(Dwarf.FrameDescriptionEntry, di.fde_list.items, context.pc, struct { pub fn compareFn(pc: usize, item: Dwarf.FrameDescriptionEntry) std.math.Order { - if (pc < item.pc_begin) return .gt; + if (pc < item.pc_begin) return .lt; const range_end = item.pc_begin + item.pc_range; if (pc < range_end) return .eq; - return .lt; + return .gt; } }.compareFn); |
