fix: firefly on linux

Author: bitwalker

README.md

@@ -69,28 +69,28 @@ instructions for below; but we also produce prebuilt packages that have everythi
 
 ##### Installing Prebuilt Distributions (Recommended)
 
-###### Linux
+###### Linux (x86_64)
 
 The instructions below reference `$XDG_DATA_HOME` as an environment variable, it
 is recommended to export XDG variables in general, but if you have not, just
 replace the usages of `$XDG_DATA_HOME` below with `$HOME/.local/share`, which is
 the usual default for this XDG variable.
 
-    mkdir -p $XDG_DATA_HOME/llvm/
-    cd $XDG_DATA_HOME/llvm/
-    wget https://github.com/lumen/llvm-project/releases/download/firefly-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-linux-gnu.tar.gz
+    mkdir -p $XDG_DATA_HOME/llvm/firefly
+    cd $XDG_DATA_HOME/llvm/firefly
+    wget https://github.com/getfirefly/llvm-project/releases/download/firefly-15.0.0-dev_2022-08-27/clang+llvm-15.0.0-x86_64-linux-gnu.tar.gz
     tar -xz --strip-components 1 -f clang+llvm-15.0.0-x86_64-linux-gnu.tar.gz
     rm clang+llvm-15.0.0-x86_64-linux-gnu.tar.gz
     cd -
 
-###### MacOS
+###### MacOS (arm64)
 
-    mkdir -p $XDG_DATA_HOME/llvm/
+    mkdir -p $XDG_DATA_HOME/llvm/firefly
     cd $XDG_DATA_HOME/llvm/
-    wget https://github.com/lumen/llvm-project/releases/download/firefly-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
-    tar -xzf clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
-    rm clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
-    mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 firefly
+    wget https://github.com/GetFirefly/llvm-project/releases/download/firefly-15.0.0-dev_2022-08-27/clang+llvm-15.0.0-arm64-apple-darwin21.6.0.tar.gz
+    tar -xzf clang+llvm-15.0.0-x86_64-apple-darwin21.6.0.tar.gz
+    rm clang+llvm-15.0.0-x86_64-apple-darwin21.6.0.tar.gz
+    mv clang+llvm-15.0.0-x86_64-apple-darwin21.6.0 firefly
     cd -
 
 ###### Other

compiler/codegen/src/meta.rs

@@ -180,6 +180,12 @@ impl ProjectInfo {
             ]);
         } else if target_os == "linux" && target_env == "uclibc" {
             platform_libs.extend_from_slice(&[("dl", NativeLibraryKind::Unspecified)]);
+        } else if target_os == "linux" && target_env == "gnu" {
+            platform_libs.extend_from_slice(&[
+                ("m", NativeLibraryKind::Unspecified),
+                ("dl", NativeLibraryKind::Unspecified),
+                ("pthread", NativeLibraryKind::Unspecified),
+            ]);
         }
 
         for (name, kind) in platform_libs.drain(..) {

compiler/llvm/build.rs

@@ -114,8 +114,10 @@ fn main() {
     }
 
     if let Ok(mut sanitizer) = env::var(ENV_LLVM_USE_SANITIZER) {
-        sanitizer.make_ascii_lowercase();
-        cfg.flag(&format!("-fsanitize={}", sanitizer));
+        if !sanitizer.is_empty() {
+            sanitizer.make_ascii_lowercase();
+            cfg.flag(&format!("-fsanitize={}", sanitizer));
+        }
     }
 
     if env::var_os("LLVM_NDEBUG").is_some() {

compiler/mlir/c_src/include/CIR-c/BinaryEntrySpecifier.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include <cstdlib>
+#include <stdint.h>
 
 #ifdef __cplusplus
+#include <cstdlib>
+
 namespace mlir {
 namespace cir {
 enum class BinaryEntrySpecifierType : uint32_t {

compiler/mlir/c_src/lib/Extensions/SymbolTable.cpp

@@ -28,10 +28,11 @@ static inline MlirVisibility wrap(mlir::SymbolTable::Visibility v) {
   switch (v) {
   case mlir::SymbolTable::Visibility::Public:
     return MlirVisibilityPublic;
-  case mlir::SymbolTable::Visibility::Private:
-    return MlirVisibilityPrivate;
   case mlir::SymbolTable::Visibility::Nested:
     return MlirVisibilityNested;
+  case mlir::SymbolTable::Visibility::Private:
+  default:
+    return MlirVisibilityPrivate;
   }
 }
 

library/rt/src/backtrace/trace.rs

@@ -39,9 +39,8 @@ impl Trace {
     #[cfg(feature = "std")]
     pub fn capture() -> Arc<Self> {
         // Allocates a new trace on the heap
-        let trace_arc = Self::new(Vec::with_capacity(Self::MAX_FRAMES));
-        let ptr = Arc::as_ptr(&trace_arc) as *mut Trace;
-        let trace = unsafe { &mut *ptr };
+        let mut trace_arc = Self::new(Vec::with_capacity(Self::MAX_FRAMES));
+        let trace = unsafe { Arc::get_mut_unchecked(&mut trace_arc) };
         //let stackmap = StackMap::get();
 
         // Capture the raw metadata for each frame in the trace

library/rt/src/lib.rs

@@ -24,6 +24,8 @@
 #![feature(const_type_id)]
 // Used for NonNull::as_uninit_mut
 #![feature(ptr_as_uninit)]
+// Used for Arc::get_mut_unchecked
+#![feature(get_mut_unchecked)]
 // The following are used for the Tuple implementation
 #![feature(trusted_len)]
 #![feature(slice_index_methods)]

runtimes/tiny/src/scheduler/swap_stack/swap_stack_linux_x86_64.s

@@ -87,18 +87,20 @@ __firefly_swap_stack:
     .cfi_def_cfa rbp, 16
     .cfi_offset rbp, -16
 
-    # Now that the frames are linked, we can call the entry point. For now, this
-    # is __firefly_trap_exceptions, which expects to receive two arguments: the function
-    # being wrapped by the exception handler, and the value of the closure environment,
-    # _if_ it is a closure being called, otherwise the value of that argument is Term::NONE
+    # Now that the frames are linked, we can call the entry point.
+    # The only argument is the value of the closure environment (or Term::NONE if not a closure)
     mov  rdi, r12
-
-    # We have already set up the stack precisely, so we don't use callq here, instead
-    # we go ahead and jump straight to the beginning of the entry function.
-    # NOTE: This call never truly returns, as the exception handler calls __firefly_builtin_exit
-    # with the return value of the 'real' entry function, or with an exception if one
-    # is caught. However, swap_stack _does_ return for all other swaps, just not the first.
     call r14
+
+    # When we return to this point, the process has fully unwound and should exit, returning
+    # back to the scheduler. We handle this by calling __firefly_builtin_exit, which sets up the
+    # process status, and then yields to the scheduler. Control never returns here, so we hint
+    # as such by which branch instruction we use
+    #
+    # NOTE: The ErlangResult struct will have been saved in rax/rdx, so we must move it to rdi/rsi
+    # to reflect passing it by value as the sole argument to the __firefly_builtin_exit intrinsic
+    mov rax, rdi
+    mov rdx, rsi
     jmp __firefly_builtin_exit
 
 .L_resume:

runtimes/tiny/src/scheduler/swap_stack/swap_stack_macos_x86_64.s

@@ -85,18 +85,20 @@ ___firefly_swap_stack:
     .cfi_def_cfa rbp, 16
     .cfi_offset rbp, -16
 
-    # Now that the frames are linked, we can call the entry point. For now, this
-    # is __firefly_trap_exceptions, which expects to receive two arguments: the function
-    # being wrapped by the exception handler, and the value of the closure environment,
-    # _if_ it is a closure being called, otherwise the value of that argument is Term::NONE
+    # Now that the frames are linked, we can call the entry point.
+    # The only argument is the value of the closure environment (or Term::NONE if not a closure)
     mov  rdi, r12
-
-    # We have already set up the stack precisely, so we don't use call here, instead
-    # we go ahead and jump straight to the beginning of the entry function.
-    # NOTE: This call never truly returns, as the exception handler calls __firefly_builtin_exit
-    # with the return value of the 'real' entry function, or with an exception if one
-    # is caught. However, swap_stack _does_ return for all other swaps, just not the first.
     call r14
+
+    # When we return to this point, the process has fully unwound and should exit, returning
+    # back to the scheduler. We handle this by calling __firefly_builtin_exit, which sets up the
+    # process status, and then yields to the scheduler. Control never returns here, so we hint
+    # as such by which branch instruction we use
+    #
+    # NOTE: The ErlangResult struct will have been saved in rax/rdx, so we must move it to rdi/rsi
+    # to reflect passing it by value as the sole argument to the __firefly_builtin_exit intrinsic
+    mov rax, rdi
+    mov rdx, rsi
     jmp ___firefly_builtin_exit
 
 L_resume: