From e8168ce8a3fde85460481dfba2296eb7e6bc5060 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 22 Jul 2023 13:32:34 +0000
Subject: Merge commit '1eded3619d0e55d57521a259bf27a03906fdfad0' into
 sync_cg_clif-2023-07-22

---
 src/debuginfo/line_info.rs | 2 +-
 src/debuginfo/mod.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/debuginfo')

diff --git a/src/debuginfo/line_info.rs b/src/debuginfo/line_info.rs
index 1b454b6667c..50bc7a127af 100644
--- a/src/debuginfo/line_info.rs
+++ b/src/debuginfo/line_info.rs
@@ -165,7 +165,7 @@ impl FunctionDebugContext {
         for &MachSrcLoc { start, end, loc } in mcr.buffer.get_srclocs_sorted() {
             debug_context.dwarf.unit.line_program.row().address_offset = u64::from(start);
             if !loc.is_default() {
-                let source_loc = *self.source_loc_set.get_index(loc.bits() as usize).unwrap();
+                let source_loc = self.source_loc_set[loc.bits() as usize];
                 create_row_for_span(debug_context, source_loc);
             } else {
                 create_row_for_span(debug_context, self.function_source_loc);
diff --git a/src/debuginfo/mod.rs b/src/debuginfo/mod.rs
index 3a7421d8b30..8a4b1cccf14 100644
--- a/src/debuginfo/mod.rs
+++ b/src/debuginfo/mod.rs
@@ -38,7 +38,7 @@ pub(crate) struct DebugContext {
 pub(crate) struct FunctionDebugContext {
     entry_id: UnitEntryId,
     function_source_loc: (FileId, u64, u64),
-    source_loc_set: indexmap::IndexSet<(FileId, u64, u64)>,
+    source_loc_set: IndexSet<(FileId, u64, u64)>,
 }
 
 impl DebugContext {
-- 
cgit 1.4.1-3-g733a5