Merge pull request #2390 from bjorn3/more_simplejit_refactors

More SimpleJIT refactorings

cranelift/codegen/src/binemit/memorysink.rs

@@ -74,9 +74,6 @@ impl<'a> MemoryCodeSink<'a> {
 
 /// A trait for receiving relocations for code that is emitted directly into memory.
 pub trait RelocSink {
-    /// Add a relocation referencing a block at the current offset.
-    fn reloc_block(&mut self, _: CodeOffset, _: Reloc, _: CodeOffset);
-
     /// Add a relocation referencing an external symbol at the current offset.
     fn reloc_external(
         &mut self,
@@ -138,11 +135,6 @@ impl<'a> CodeSink for MemoryCodeSink<'a> {
         self.write(x);
     }
 
-    fn reloc_block(&mut self, rel: Reloc, block_offset: CodeOffset) {
-        let ofs = self.offset();
-        self.relocs.reloc_block(ofs, rel, block_offset);
-    }
-
     fn reloc_external(
         &mut self,
         srcloc: SourceLoc,
@@ -204,7 +196,6 @@ impl<'a> CodeSink for MemoryCodeSink<'a> {
 pub struct NullRelocSink {}
 
 impl RelocSink for NullRelocSink {
-    fn reloc_block(&mut self, _: CodeOffset, _: Reloc, _: CodeOffset) {}
     fn reloc_external(
         &mut self,
         _: CodeOffset,

cranelift/codegen/src/binemit/mod.rs

@@ -140,9 +140,6 @@ pub trait CodeSink {
     /// Add 8 bytes to the code section.
     fn put8(&mut self, _: u64);
 
-    /// Add a relocation referencing a block at the current offset.
-    fn reloc_block(&mut self, _: Reloc, _: CodeOffset);
-
     /// Add a relocation referencing an external symbol plus the addend at the current offset.
     fn reloc_external(&mut self, _: SourceLoc, _: Reloc, _: &ExternalName, _: Addend);
 

cranelift/codegen/src/isa/test_utils.rs

@@ -59,8 +59,6 @@ impl CodeSink for TestCodeSink {
         }
     }
 
-    fn reloc_block(&mut self, _rel: Reloc, _block_offset: CodeOffset) {}
-
     fn reloc_external(
         &mut self,
         _srcloc: SourceLoc,