Remove faerie support

Author: bjorn3

.travis.yml

@@ -21,6 +21,3 @@ env:
     - RUST_BACKTRACE=1
     # Reduce amount of benchmark runs as they are slow.
     - COMPILE_RUNS=2 RUN_RUNS=2
-  jobs:
-    - "CG_CLIF_COMPILE_FLAGS="
-    - "CG_CLIF_COMPILE_FLAGS='--features backend_object'"

Cargo.lock

@@ -7,19 +7,13 @@ edition = "2018"
 [lib]
 crate-type = ["dylib"]
 
-[features]
-default = ["backend_object"]
-backend_object = ["object/write", "cranelift-object"]
-
 [dependencies]
 # These have to be in sync with each other
 cranelift-codegen = { git = "https://github.com/bytecodealliance/cranelift/", default-features = false, features = ["std"] }
 cranelift-frontend = { git = "https://github.com/bytecodealliance/cranelift/", default-features = false, features = ["std"] }
 cranelift-module = { git = "https://github.com/bytecodealliance/cranelift/" }
-cranelift-faerie = { git = "https://github.com/bytecodealliance/cranelift/" }
-cranelift-object = { git = "https://github.com/bytecodealliance/cranelift/", optional = true }
+cranelift-object = { git = "https://github.com/bytecodealliance/cranelift/" }
 target-lexicon = "0.10.0"
-faerie = "0.14.0"
 
 #goblin = "0.0.17"
 ar = "0.8.0"
@@ -30,7 +24,7 @@ indexmap = "1.0.2"
 [dependencies.object]
 version = "0.17.0"
 default-features = false
-features = ["compression", "read", "std"] # We don't need WASM support
+features = ["compression", "read", "std", "write"] # We don't need WASM support
 
 [dependencies.gimli]
 version = "0.19.0"
@@ -43,7 +37,6 @@ features = ["write"] # We don't need read support
 #cranelift-frontend = { path = "../cranelift/cranelift-frontend", default-features = false, features = ["std"] }
 #cranelift-module = { path = "../cranelift/cranelift-module" }
 #cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
-#cranelift-faerie = { path = "../cranelift/cranelift-faerie" }
 #cranelift-object = { path = "../cranelift/cranelift-object" }
 
 #[patch.crates-io]

Cargo.toml

@@ -5,14 +5,9 @@ use rustc::session::Session;
 
 use cranelift_module::{FuncId, Module};
 
-use faerie::*;
-#[cfg(feature = "backend_object")]
 use object::{SectionKind, SymbolFlags, RelocationKind, RelocationEncoding};
-#[cfg(feature = "backend_object")]
 use object::write::*;
-use cranelift_faerie::{FaerieBackend, FaerieBuilder, FaerieProduct, FaerieTrapCollection};
 
-#[cfg(feature = "backend_object")]
 use cranelift_object::*;
 
 use gimli::SectionId;
@@ -23,30 +18,6 @@ pub trait WriteMetadata {
     fn add_rustc_section(&mut self, symbol_name: String, data: Vec<u8>, is_like_osx: bool);
 }
 
-impl WriteMetadata for faerie::Artifact {
-    fn add_rustc_section(&mut self, symbol_name: String, data: Vec<u8>, is_like_osx: bool) {
-        self
-            .declare(".rustc", faerie::Decl::section(faerie::SectionKind::Data))
-            .unwrap();
-        self
-            .define_with_symbols(".rustc", data, {
-                let mut map = std::collections::BTreeMap::new();
-                // FIXME implement faerie elf backend section custom symbols
-                // For MachO this is necessary to prevent the linker from throwing away the .rustc section,
-                // but for ELF it isn't.
-                if is_like_osx {
-                    map.insert(
-                        symbol_name,
-                        0,
-                    );
-                }
-                map
-            })
-            .unwrap();
-    }
-}
-
-#[cfg(feature = "backend_object")]
 impl WriteMetadata for object::write::Object {
     fn add_rustc_section(&mut self, symbol_name: String, data: Vec<u8>, _is_like_osx: bool) {
         let segment = self.segment_name(object::write::StandardSegment::Data).to_vec();
@@ -80,42 +51,6 @@ pub trait WriteDebugInfo {
     );
 }
 
-impl WriteDebugInfo for FaerieProduct {
-    type SectionId = SectionId;
-
-    fn add_debug_section(&mut self, id: SectionId, data: Vec<u8>) -> SectionId {
-        self.artifact.declare_with(id.name(), Decl::section(faerie::SectionKind::Debug), data).unwrap();
-        id
-    }
-
-    fn add_debug_reloc(
-        &mut self,
-        _section_map: &HashMap<SectionId, Self::SectionId>,
-        symbol_map: &indexmap::IndexMap<FuncId, String>,
-        from: &Self::SectionId,
-        reloc: &DebugReloc,
-    ) {
-        self
-            .artifact
-            .link_with(
-                faerie::Link {
-                    from: from.name(),
-                    to: match reloc.name {
-                        DebugRelocName::Section(id) => id.name(),
-                        DebugRelocName::Symbol(index) => &symbol_map.get_index(index).unwrap().1,
-                    },
-                    at: u64::from(reloc.offset),
-                },
-                faerie::Reloc::Debug {
-                    size: reloc.size,
-                    addend: reloc.addend as i32,
-                },
-            )
-            .expect("faerie relocation error");
-    }
-}
-
-#[cfg(feature = "backend_object")]
 impl WriteDebugInfo for ObjectProduct {
     type SectionId = (object::write::SectionId, object::write::SymbolId);
 
@@ -168,30 +103,12 @@ pub trait Emit {
     fn emit(self) -> Vec<u8>;
 }
 
-impl Emit for FaerieProduct {
-    fn emit(self) -> Vec<u8> {
-        self.artifact.emit().unwrap()
-    }
-}
-
-#[cfg(feature = "backend_object")]
 impl Emit for ObjectProduct {
     fn emit(self) -> Vec<u8> {
         self.object.write().unwrap()
     }
 }
 
-#[cfg(not(feature = "backend_object"))]
-pub fn with_object(sess: &Session, name: &str, f: impl FnOnce(&mut Artifact)) -> Vec<u8> {
-    let mut metadata_artifact = faerie::Artifact::new(
-        crate::build_isa(sess, true).triple().clone(),
-        name.to_string(),
-    );
-    f(&mut metadata_artifact);
-    metadata_artifact.emit().unwrap()
-}
-
-#[cfg(feature = "backend_object")]
 pub fn with_object(sess: &Session, name: &str, f: impl FnOnce(&mut Object)) -> Vec<u8> {
     let triple = crate::build_isa(sess, true).triple().clone();
     let mut metadata_object =
@@ -203,21 +120,6 @@ pub fn with_object(sess: &Session, name: &str, f: impl FnOnce(&mut Object)) -> V
 
 pub type Backend = impl cranelift_module::Backend<Product: Emit + WriteDebugInfo>;
 
-#[cfg(not(feature = "backend_object"))]
-pub fn make_module(sess: &Session, name: String) -> Module<Backend> {
-    let module: Module<FaerieBackend> = Module::new(
-        FaerieBuilder::new(
-            crate::build_isa(sess, true),
-            name + ".o",
-            FaerieTrapCollection::Disabled,
-            cranelift_module::default_libcall_names(),
-        )
-        .unwrap(),
-    );
-    module
-}
-
-#[cfg(feature = "backend_object")]
 pub fn make_module(sess: &Session, name: String) -> Module<Backend> {
     let module: Module<ObjectBackend> = Module::new(
         ObjectBuilder::new(

src/backend.rs

@@ -4,10 +4,10 @@ set -e
 
 if [[ "$1" == "--release" ]]; then
     export CHANNEL='release'
-    CARGO_INCREMENTAL=1 cargo build --release $CG_CLIF_COMPILE_FLAGS
+    CARGO_INCREMENTAL=1 cargo build --release
 else
     export CHANNEL='debug'
-    cargo build $CG_CLIF_COMPILE_FLAGS
+    cargo build
 fi
 
 source config.sh