Merge pull request #146 from dhalbert/stack_check-fix

Fix broken mp_stack_check() when using -flto

1 files changed, 4 insertions, 0 deletions

diff --git a/py/stackctrl.c b/py/stackctrl.c
index 83d1faeb9..1c46a9434 100644
--- a/py/stackctrl.c
+++ b/py/stackctrl.c
@@ -31,6 +31,8 @@
 #include "py/stackctrl.h"
 
 void mp_stack_ctrl_init(void) {
+    // Force routine to not be inlined. Better guarantee than MP_NOINLINE for -flto.
+    asm("");
     volatile int stack_dummy;
     MP_STATE_THREAD(stack_top) = (char*)&stack_dummy;
 }
@@ -41,6 +43,8 @@ void mp_stack_set_top(void *top) {
 
 mp_uint_t mp_stack_usage(void) {
     // Assumes descending stack
+    // Force routine to not be inlined. Better guarantee than MP_NOINLINE for -flto.
+    asm("");
     volatile int stack_dummy;
     return MP_STATE_THREAD(stack_top) - (char*)&stack_dummy;
 }