Use mir::SourceInfo again in FunctionCx.source_info_set

Fixes #800

Author: bjorn3

src/common.rs

@@ -270,8 +270,7 @@ pub struct FunctionCx<'clif, 'tcx, B: Backend + 'static> {
     pub constants_cx: &'clif mut crate::constant::ConstantCx,
     pub caches: &'clif mut Caches<'tcx>,
 
-    // FIXME switch back to `SourceInfo`, once it derives `Eq` and `Hash` again.
-    pub source_info_set: indexmap::IndexSet<(Span, mir::SourceScope)>,
+    pub source_info_set: indexmap::IndexSet<SourceInfo>,
 }
 
 impl<'tcx, B: Backend> LayoutOf for FunctionCx<'_, 'tcx, B> {
@@ -350,7 +349,7 @@ impl<'tcx, B: Backend + 'static> FunctionCx<'_, 'tcx, B> {
     }
 
     pub fn set_debug_loc(&mut self, source_info: mir::SourceInfo) {
-        let (index, _) = self.source_info_set.insert_full((source_info.span, source_info.scope));
+        let (index, _) = self.source_info_set.insert_full(source_info);
         self.bcx.set_srcloc(SourceLoc::new(index as u32));
     }
 

src/debuginfo/line_info.rs

@@ -105,7 +105,7 @@ impl<'a, 'tcx> FunctionDebugContext<'a, 'tcx> {
         &mut self,
         context: &Context,
         isa: &dyn cranelift_codegen::isa::TargetIsa,
-        source_info_set: &indexmap::IndexSet<(Span, mir::SourceScope)>,
+        source_info_set: &indexmap::IndexSet<SourceInfo>,
     ) -> CodeOffset {
         let tcx = self.debug_context.tcx;
 
@@ -147,7 +147,7 @@ impl<'a, 'tcx> FunctionDebugContext<'a, 'tcx> {
                 line_program.row().address_offset = offset as u64;
                 if !srcloc.is_default() {
                     let source_info = *source_info_set.get_index(srcloc.bits() as usize).unwrap();
-                    create_row_for_span(line_program, source_info.0);
+                    create_row_for_span(line_program, source_info.span);
                 } else {
                     create_row_for_span(line_program, self.mir.span);
                 }

src/debuginfo/mod.rs

@@ -254,7 +254,7 @@ impl<'a, 'tcx> FunctionDebugContext<'a, 'tcx> {
         &mut self,
         context: &Context,
         isa: &dyn cranelift_codegen::isa::TargetIsa,
-        source_info_set: &indexmap::IndexSet<(Span, mir::SourceScope)>,
+        source_info_set: &indexmap::IndexSet<SourceInfo>,
         local_map: HashMap<mir::Local, CPlace<'tcx>>,
     ) {
         let end = self.create_debug_lines(context, isa, source_info_set);