Remove trap from CodeSink

And introduce MachBufferFinalized::traps() in the place.

cranelift/codegen/src/binemit/memorysink.rs

@@ -35,7 +35,6 @@ pub struct MemoryCodeSink<'a> {
     /// Offset is isize because its major consumer needs it in that form.
     offset: isize,
     relocs: &'a mut dyn RelocSink,
-    traps: &'a mut dyn TrapSink,
 }
 
 impl<'a> MemoryCodeSink<'a> {
@@ -48,13 +47,11 @@ impl<'a> MemoryCodeSink<'a> {
     pub unsafe fn new(
         data: *mut u8,
         relocs: &'a mut dyn RelocSink,
-        traps: &'a mut dyn TrapSink,
     ) -> Self {
         Self {
             data,
             offset: 0,
             relocs,
-            traps,
         }
     }
 
@@ -106,11 +103,6 @@ impl<'a> CodeSink for MemoryCodeSink<'a> {
         let ofs = self.offset as CodeOffset;
         self.relocs.reloc_external(ofs, srcloc, rel, name, addend);
     }
-
-    fn trap(&mut self, code: TrapCode, srcloc: SourceLoc) {
-        let ofs = self.offset as CodeOffset;
-        self.traps.trap(ofs, srcloc, code);
-    }
 }
 
 /// A `RelocSink` implementation that does nothing, which is convenient when

cranelift/codegen/src/binemit/mod.rs

@@ -11,7 +11,7 @@ pub use self::memorysink::{
     TrapSink,
 };
 pub use self::stack_map::StackMap;
-use crate::ir::{ExternalName, SourceLoc, TrapCode};
+use crate::ir::{ExternalName, SourceLoc};
 use core::fmt;
 #[cfg(feature = "enable-serde")]
 use serde::{Deserialize, Serialize};
@@ -110,7 +110,4 @@ pub trait CodeSink {
 
     /// Add a relocation referencing an external symbol plus the addend at the current offset.
     fn reloc_external(&mut self, _: SourceLoc, _: Reloc, _: &ExternalName, _: Addend);
-
-    /// Add trap information for the current offset.
-    fn trap(&mut self, _: TrapCode, _: SourceLoc);
 }