Revert "alloca seems buggy on M4"

dhalbert · dhalbert · commit 302ad40fb28e · 2018-01-24T19:24:36.000-05:00
This reverts commit 4b1e9d8.
diff --git a/extmod/modure.c b/extmod/modure.c
@@ -144,7 +144,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
     }
 
     mp_obj_t retval = mp_obj_new_list(0, NULL);
-    const char* caps[caps_num];
+    const char **caps = alloca(caps_num * sizeof(char*));
     while (true) {
         // cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char
         memset((char**)caps, 0, caps_num * sizeof(char*));
diff --git a/py/runtime.c b/py/runtime.c
@@ -1428,10 +1428,9 @@ mp_obj_t mp_import_from(mp_obj_t module, qstr name) {
     mp_load_method_maybe(module, MP_QSTR___name__, dest);
     size_t pkg_name_len;
     const char *pkg_name = mp_obj_str_get_data(dest[0], &pkg_name_len);
+
     const uint dot_name_len = pkg_name_len + 1 + qstr_len(name);
-    // Previously dot_name was created using alloca(), but that caused run-time crashes on M4 due to
-    // stack corruption (compiler bug, it appears), so use an array instead.
-    char dot_name[dot_name_len];
+    char *dot_name = alloca(dot_name_len);
     memcpy(dot_name, pkg_name, pkg_name_len);
     dot_name[pkg_name_len] = '.';
     memcpy(dot_name + pkg_name_len + 1, qstr_str(name), qstr_len(name));

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`mp_obj_t retval = mp_obj_new_list(0, NULL);`
`147`		`- const char* caps[caps_num];`
	`147`	`+ const char *caps = alloca(caps_num sizeof(char*));`
`148`	`148`	`while (true) {`
`149`	`149`	`// cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char`
`150`	`150`	`memset((char*)caps, 0, caps_num sizeof(char*));`