Update patch to only update longjmp

Author: kateinoigakukun

patches/0001-allocate-asyncify-buffer-on-heap.patch

@@ -1,56 +1,59 @@
-From af4a44fbb3713b05b521b70e55f83cf6bc7f403b Mon Sep 17 00:00:00 2001
+From dbbf373dd41fc9163272c77849eff4b0053cf916 Mon Sep 17 00:00:00 2001
 From: Yuta Saito <[email protected]>
 Date: Sun, 4 Sep 2022 14:34:24 +0000
 Subject: [PATCH] [wasm] Allocate asyncify buffer on heap to save stack usage
 
 ---
- wasm/setjmp.c | 13 +++++++++++--
- wasm/setjmp.h |  1 -
- 2 files changed, 11 insertions(+), 3 deletions(-)
+ wasm/setjmp.c | 7 +++++--
+ wasm/setjmp.h | 2 +-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/wasm/setjmp.c b/wasm/setjmp.c
-index 90420877a8..841fda22a3 100644
+index 90420877a8..c782987454 100644
 --- a/wasm/setjmp.c
 +++ b/wasm/setjmp.c
-@@ -66,8 +66,15 @@ enum rb_wasm_jmp_buf_state {
- void
- async_buf_init(struct __rb_wasm_asyncify_jmp_buf* buf)
- {
--    buf->top = &buf->buffer[0];
--    buf->end = &buf->buffer[WASM_SETJMP_STACK_BUFFER_SIZE];
-+    char *buffer = malloc(WASM_SETJMP_STACK_BUFFER_SIZE);
-+    buf->top = buffer;
-+    buf->end = buffer + WASM_SETJMP_STACK_BUFFER_SIZE;
-+}
-+
-+inline static void
-+async_buf_deinit(struct __rb_wasm_asyncify_jmp_buf* buf)
-+{
-+    free(buf->top);
- }
- 
- // Global unwinding/rewinding jmpbuf state
-@@ -100,6 +107,8 @@ _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
+@@ -84,6 +84,7 @@ _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
+         RB_WASM_DEBUG_LOG("  JMP_BUF_STATE_INITIALIZED");
+         env->state = JMP_BUF_STATE_CAPTURING;
+         env->payload = 0;
++        env->longjmp_buf_ptr = NULL;
+         _rb_wasm_active_jmpbuf = env;
+         async_buf_init(&env->setjmp_buf);
+         asyncify_start_unwind(&env->setjmp_buf);
+@@ -100,6 +101,7 @@ _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
          asyncify_stop_rewind();
          RB_WASM_DEBUG_LOG("  JMP_BUF_STATE_RETURNING");
          env->state = JMP_BUF_STATE_CAPTURED;
-+        async_buf_deinit(&env->longjmp_buf);
-+        async_buf_deinit(&env->setjmp_buf);
++        free(env->longjmp_buf_ptr);
          _rb_wasm_active_jmpbuf = NULL;
          return env->payload;
      }
+@@ -117,9 +119,10 @@ _rb_wasm_longjmp(rb_wasm_jmp_buf* env, int value)
+     assert(value != 0);
+     env->state = JMP_BUF_STATE_RETURNING;
+     env->payload = value;
++    env->longjmp_buf_ptr = malloc(sizeof(struct __rb_wasm_asyncify_jmp_buf));
+     _rb_wasm_active_jmpbuf = env;
+-    async_buf_init(&env->longjmp_buf);
+-    asyncify_start_unwind(&env->longjmp_buf);
++    async_buf_init(env->longjmp_buf_ptr);
++    asyncify_start_unwind(env->longjmp_buf_ptr);
+ }
+ 
+ 
 diff --git a/wasm/setjmp.h b/wasm/setjmp.h
-index 65e35c03b3..ddfc742270 100644
+index 65e35c03b3..cc14df33be 100644
 --- a/wasm/setjmp.h
 +++ b/wasm/setjmp.h
-@@ -11,7 +11,6 @@
- struct __rb_wasm_asyncify_jmp_buf {
-     void* top;
-     void* end;
--    char buffer[WASM_SETJMP_STACK_BUFFER_SIZE];
- };
- 
- typedef struct {
+@@ -19,7 +19,7 @@ typedef struct {
+     struct __rb_wasm_asyncify_jmp_buf setjmp_buf;
+     // Internal Asyncify buffer space used while unwinding from longjmp
+     // but never used for rewinding.
+-    struct __rb_wasm_asyncify_jmp_buf longjmp_buf;
++    struct __rb_wasm_asyncify_jmp_buf *longjmp_buf_ptr;
+     // Used to save top address of Asyncify stack `setjmp_buf`, which is
+     // overwritten during first rewind.
+     void *dst_buf_top;
 -- 
 2.40.0