From 17e371f1836677f51f8799caae76c7b2d2ffe6ae Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992@gmail.com>
Date: Sat, 10 Sep 2016 13:33:23 -0400
Subject: [PATCH] Avoid infinite method error on bootstrap error

---
 ui/repl.c | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/ui/repl.c b/ui/repl.c
index 826d23fb0dd7ee..4ad3f2dbf92b85 100644
--- a/ui/repl.c
+++ b/ui/repl.c
@@ -44,30 +44,41 @@ __attribute__((constructor)) void jl_register_ptls_states_getter(void)
 static int exec_program(char *program)
 {
     jl_ptls_t ptls = jl_get_ptls_states();
-    int err = 0;
-  again: ;
     JL_TRY {
-        if (err) {
-            jl_value_t *errs = jl_stderr_obj();
-            jl_value_t *e = ptls->exception_in_transit;
-            if (errs != NULL) {
+        jl_load(program);
+    }
+    JL_CATCH {
+        jl_value_t *errs = jl_stderr_obj();
+        jl_value_t *e = ptls->exception_in_transit;
+        // Manually save and restore the backtrace so that we print the original
+        // one instead of the one caused by `jl_show`.
+        // We can't use safe_restore since that will cause any error
+        // (including the ones that would have been caught) to abort.
+        uintptr_t *volatile bt_data = NULL;
+        size_t bt_size = ptls->bt_size;
+        JL_TRY {
+            if (errs) {
+                bt_data = (uintptr_t*)malloc(bt_size * sizeof(void*));
+                memcpy(bt_data, ptls->bt_data, bt_size * sizeof(void*));
                 jl_show(errs, e);
-            }
-            else {
-                jl_printf(JL_STDERR, "error during bootstrap:\n");
-                jl_static_show(JL_STDERR, e);
                 jl_printf(JL_STDERR, "\n");
-                jlbacktrace();
+                free(bt_data);
             }
+        }
+        JL_CATCH {
+            ptls->bt_size = bt_size;
+            memcpy(ptls->bt_data, bt_data, bt_size * sizeof(void*));
+            free(bt_data);
+            errs = NULL;
+        }
+        if (!errs) {
+            jl_printf(JL_STDERR, "error during bootstrap:\n");
+            jl_static_show(JL_STDERR, e);
+            jl_printf(JL_STDERR, "\n");
+            jlbacktrace();
             jl_printf(JL_STDERR, "\n");
-            JL_EH_POP();
-            return 1;
         }
-        jl_load(program);
-    }
-    JL_CATCH {
-        err = 1;
-        goto again;
+        return 1;
     }
     return 0;
 }