commit 3556e45711c3b7ec712748d013e678d035185bdd
author Dave Hylands <dhylands@gmail.com> Tue Oct 07 00:50:20 2014 -0700
committer Dave Hylands <dhylands@gmail.com> Tue Oct 07 08:07:49 2014 -0700
tree da58cd4deb464baafcc1771a5fd54eacc38b33d7
parent 67f25dfe6f4b13a3b8d40746d2b2fd720c63caed

Allow real memory errors (from locked gc) to be reported with traceback.

py/runtime.c

diff --git a/py/runtime.c b/py/runtime.c
index 945713d..71979c0 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -51,6 +51,7 @@
 #include "parsehelper.h"
 #include "compile.h"
 #include "stackctrl.h"
+#include "gc.h"
 
 #if 0 // print debugging info
 #define DEBUG_PRINT (1)
@@ -1207,7 +1208,13 @@
 
 void *m_malloc_fail(size_t num_bytes) {
     DEBUG_printf("memory allocation failed, allocating " UINT_FMT " bytes\n", num_bytes);
-    nlr_raise((mp_obj_t)&mp_const_MemoryError_obj);
+    if (gc_is_locked()) {
+        nlr_raise(mp_obj_new_exception_msg(& mp_type_MemoryError, 
+                                           "memory allocation failed, heap is locked"));
+    } else {
+        nlr_raise(mp_obj_new_exception_msg_varg(& mp_type_MemoryError, 
+                                                "memory allocation failed, allocating " UINT_FMT " bytes", num_bytes));
+    }
 }
 
 NORETURN void mp_not_implemented(const char *msg) {