diff --git a/lib/std/Build/Fuzz/WebServer.zig b/lib/std/Build/Fuzz/WebServer.zig
index 17bc2c918f7ebcc70f956ded52a379b30a33af43..376322c3ecf6345fac2567df0c25b695253612ec 100644
--- a/lib/std/Build/Fuzz/WebServer.zig
+++ b/lib/std/Build/Fuzz/WebServer.zig
@@ -664,8 +664,8 @@ fn addEntryPoint(ws: *WebServer, coverage_id: u64, addr: u64) error{ AlreadyRepo
     if (false) {
         const sl = coverage_map.source_locations[index];
         const file_name = coverage_map.coverage.stringAt(coverage_map.coverage.fileAt(sl.file).basename);
-        log.debug("server found entry point {s}:{d}:{d}", .{
-            file_name, sl.line, sl.column,
+        log.debug("server found entry point for 0x{x} at {s}:{d}:{d}", .{
+            addr, file_name, sl.line, sl.column,
         });
     }
     const gpa = ws.gpa;
diff --git a/lib/std/debug/Coverage.zig b/lib/std/debug/Coverage.zig
index bb6f7aabcb1e0eb38c040cf7da9b3cb7c657d5cd..3971d770f375271f8875251586002cd51ba02583 100644
--- a/lib/std/debug/Coverage.zig
+++ b/lib/std/debug/Coverage.zig
@@ -174,28 +174,30 @@ pub fn resolveAddressesDwarf(
             continue :next_pc;
         }
         const cu = &d.compile_unit_list.items[range.compile_unit_index];
-        if (cu.src_loc_cache == null) {
-            cov.mutex.unlock();
-            defer cov.mutex.lock();
-            d.populateSrcLocCache(gpa, cu) catch |err| switch (err) {
-                error.MissingDebugInfo, error.InvalidDebugInfo => {
-                    out.* = SourceLocation.invalid;
-                    continue :next_pc;
-                },
-                else => |e| return e,
-            };
-        }
-        const slc = &cu.src_loc_cache.?;
-        const table_addrs = slc.line_table.keys();
         if (cu != prev_cu) {
             prev_cu = cu;
+            if (cu.src_loc_cache == null) {
+                cov.mutex.unlock();
+                defer cov.mutex.lock();
+                d.populateSrcLocCache(gpa, cu) catch |err| switch (err) {
+                    error.MissingDebugInfo, error.InvalidDebugInfo => {
+                        out.* = SourceLocation.invalid;
+                        continue :next_pc;
+                    },
+                    else => |e| return e,
+                };
+            }
+            const slc = &cu.src_loc_cache.?;
+            const table_addrs = slc.line_table.keys();
             line_table_i = std.sort.upperBound(u64, table_addrs, pc, struct {
                 fn order(context: u64, item: u64) std.math.Order {
                     return std.math.order(item, context);
                 }
             }.order);
         }
-        while (line_table_i < table_addrs.len and table_addrs[line_table_i] < pc) line_table_i += 1;
+        const slc = &cu.src_loc_cache.?;
+        const table_addrs = slc.line_table.keys();
+        while (line_table_i < table_addrs.len and table_addrs[line_table_i] <= pc) line_table_i += 1;
 
         const entry = slc.line_table.values()[line_table_i - 1];
         const corrected_file_index = entry.file - @intFromBool(slc.version < 5);