feat: include liblld instead of spawning as process

.github/actions/install-llvm/dist/index.js

@@ -975,7 +975,7 @@ async function execute(cmd) {
 (async () => {
     try {
         if(isLinux) {
-            await exec.exec("sudo apt install llvm-7 llvm-7-* lld-7");
+            await exec.exec("sudo apt install llvm-7 llvm-7-* liblld-7*");
         } else if(isMacOS) {
             await exec.exec("brew install llvm@7")
             let llvmPath = await execute("brew --prefix llvm@7");
@@ -997,6 +997,7 @@ async function execute(cmd) {
     }
 })();
 
+
 /***/ }),
 
 /***/ 129:

.github/actions/install-llvm/index.js

@@ -30,7 +30,7 @@ export async function execute(cmd) {
 (async () => {
     try {
         if(isLinux) {
-            await exec.exec("sudo apt install llvm-7 llvm-7-* lld-7");
+            await exec.exec("sudo apt install llvm-7 llvm-7-* liblld-7*");
         } else if(isMacOS) {
             await exec.exec("brew install llvm@7")
             let llvmPath = await execute("brew --prefix llvm@7");
@@ -50,4 +50,4 @@ export async function execute(cmd) {
     } catch(error) {
         core.setFailed(error.message);
     }
-})();
+})();

README.md

@@ -83,12 +83,12 @@ rustup](https://www.rust-lang.org/tools/install).
 
 Mun targets LLVM 7.1.0. Installing LLVM is platform dependant and as such can be a pain. The
 following steps are how we install LLVM on [our CI
-runners](https://github.com/mun-lang/mun/blob/master/ci/azure-install-llvm.yml):
+runners](.github/actions/install-llvm/index.js):
 
 * ***nix**: Package managers of recent *nix distros can install binary versions of LLVM, e.g.:
   ```bash
   # Ubuntu 18.04
-  sudo apt install llvm-7 llvm-7-* lld-7
+  sudo apt install llvm-7 llvm-7-* liblld-7*
   ```
 * **macOS**: [Brew](https://brew.sh/) contains a binary distribution of LLVM 7.1.0. However, as it's
   not the latest version, it won't be added to the path. We are using

crates/mun_codegen/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2018"
 inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm7-0" }
 mun_hir = { path = "../mun_hir" }
 mun_target = { path = "../mun_target" }
+mun_lld = { path = "../mun_lld" }
 failure = "0.1.5"
 salsa="0.12"
 md5="0.6.1"
@@ -21,4 +22,4 @@ insta = "0.12.0"
 [build-dependencies]
 lazy_static = "1.4.0"
 semver = "0.9.0"
-regex = "1.3.1"
+regex = "1.3.1"

crates/mun_codegen/src/code_gen.rs

@@ -1,3 +1,4 @@
+use crate::code_gen::linker::LinkerError;
 use crate::IrDatabase;
 use failure::Fail;
 use inkwell::module::Module;
@@ -7,17 +8,16 @@ use inkwell::OptimizationLevel;
 use mun_hir::FileId;
 use std::io::{self, Write};
 use std::path::Path;
-use std::process::{Child, Stdio};
 
 mod abi_types;
 mod linker;
 
 #[derive(Debug, Fail)]
 enum CodeGenerationError {
-    #[fail(display = "linker error: {}", 0)]
-    LinkerError(String),
-    #[fail(display = "linker error: {}", 0)]
-    SpawningLinkerError(io::Error),
+    #[fail(display = "{}", 0)]
+    LinkerError(#[fail(cause)] LinkerError),
+    #[fail(display = "error linking modules: {}", 0)]
+    ModuleLinkerError(String),
     #[fail(display = "unknown target triple: {}", 0)]
     UnknownTargetTriple(String),
     #[fail(display = "error creating target machine")]
@@ -28,6 +28,12 @@ enum CodeGenerationError {
     CodeGenerationError(String),
 }
 
+impl From<LinkerError> for CodeGenerationError {
+    fn from(e: LinkerError) -> Self {
+        CodeGenerationError::LinkerError(e)
+    }
+}
+
 /// Construct a shared object for the given `hir::FileId` at the specified output file location.
 pub fn write_module_shared_object(
     db: &impl IrDatabase,
@@ -49,7 +55,7 @@ pub fn write_module_shared_object(
     let module = db.module_ir(file_id);
     assembly_module
         .link_in_module(module.llvm_module.clone())
-        .map_err(|e| CodeGenerationError::LinkerError(e.to_string()))?;
+        .map_err(|e| CodeGenerationError::ModuleLinkerError(e.to_string()))?;
 
     // Generate the `get_info` method.
     symbols::gen_reflection_ir(
@@ -100,25 +106,13 @@ pub fn write_module_shared_object(
 
     // Construct a linker for the target
     let mut linker = linker::create_with_target(&target);
-    linker.add_object(obj_file.path());
+    linker.add_object(obj_file.path())?;
 
     // Link the object
-    linker.build_shared_object(&output_file_path);
-
-    let mut cmd = linker.finalize();
-    let result = cmd
-        .stderr(Stdio::piped())
-        .spawn()
-        .and_then(Child::wait_with_output)
-        .map_err(CodeGenerationError::SpawningLinkerError)?;
-
-    if !result.status.success() {
-        let error = String::from_utf8(result.stderr)
-            .unwrap_or_else(|_| "<linker error contains invalid utf8>".to_owned());
-        Err(CodeGenerationError::LinkerError(error).into())
-    } else {
-        Ok(())
-    }
+    linker.build_shared_object(&output_file_path)?;
+    linker.finalize()?;
+
+    Ok(())
 }
 
 /// Optimizes the specified LLVM `Module` using the default passes for the given