fix: don't use #[naked] when inlining is paramount for correctness

Functions with `#[naked]` are no longer eligible for inlining as of <rust-lang/rust#79192>. Fixes test failures in the RISC-V port.
r3-os · Dec 6, 2020 · 32d5fdc · 32d5fdc
1 parent 72bb293
commit 32d5fdc
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 3 deletions.
diff --git a/src/r3_port_arm/src/startup/imp.rs b/src/r3_port_arm/src/startup/imp.rs
@@ -30,7 +30,6 @@ impl VectorTable {
     }
 }
 
-#[naked]
 #[inline(always)]
 pub fn start<System: EntryPoint + StartupOptions>() {
     unsafe {

diff --git a/src/r3_port_riscv/src/threading/cfg.rs b/src/r3_port_riscv/src/threading/cfg.rs
@@ -61,7 +61,6 @@ macro_rules! use_port {
                     unsafe { PORT_STATE.port_boot::<Self>() };
                 }
 
-                #[naked]
                 #[inline(always)]
                 unsafe fn exception_handler() -> ! {
                     unsafe { State::exception_handler::<Self>() };

diff --git a/src/r3_port_riscv/src/threading/imp.rs b/src/r3_port_riscv/src/threading/imp.rs
@@ -1113,7 +1113,6 @@ impl State {
     }
 
     /// Implements [`crate::EntryPoint::exception_handler`].
-    #[naked]
     #[inline(always)]
     pub unsafe fn exception_handler<System: PortInstance>() -> ! {
         const FRAME_SIZE: usize = if cfg!(target_feature = "f") {