1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix jump buffer leak in setjmp handler in WASI builds"

Browse Source 
This reverts the following commits as it's causing OOM in some cases in
ruby/ruby.wasm test suite.
* 372515f33c908b36b3f5fbd2edcb34c69b418500
* 3a730be8b464454878a42132f6fecb98ab4c1b5b
This commit is contained in:
Yuta Saito 2025-04-01 11:01:49 +00:00
parent a671b25525
commit 30e5e7c005
Notes: git 2025-04-01 16:11:17 +00:00 
Merged: https://github.com/ruby/ruby/pull/13026
2 changed files with 29 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eval_intern.h
View File

@ -102,11 +102,11 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
_tag.tag = Qundef; \ _tag.tag = Qundef; \
_tag.prev = _ec->tag; \ _tag.prev = _ec->tag; \
_tag.lock_rec = rb_ec_vm_lock_rec(_ec); \ _tag.lock_rec = rb_ec_vm_lock_rec(_ec); \
rb_vm_tag_jmpbuf_init(&_tag); rb_vm_tag_jmpbuf_init(&_tag.buf); \
#define EC_POP_TAG() \ #define EC_POP_TAG() \
_ec->tag = _tag.prev; \ _ec->tag = _tag.prev; \
rb_vm_tag_jmpbuf_deinit(&_tag); \ rb_vm_tag_jmpbuf_deinit(&_tag.buf); \
} while (0) } while (0)
#define EC_TMPPOP_TAG() \ #define EC_TMPPOP_TAG() \

81
vm_core.h
View File

@ -946,16 +946,37 @@ typedef void *rb_jmpbuf_t[5];
Therefore, we allocates the buffer on the heap on such Therefore, we allocates the buffer on the heap on such
environments. environments.
*/ */
typedef struct _rb_vm_tag_jmpbuf { typedef rb_jmpbuf_t *rb_vm_tag_jmpbuf_t;
struct _rb_vm_tag_jmpbuf *next;
rb_jmpbuf_t buf;
} *rb_vm_tag_jmpbuf_t;
#define RB_VM_TAG_JMPBUF_GET(jmpbuf) ((jmpbuf)->buf) #define RB_VM_TAG_JMPBUF_GET(buf) (*buf)
static inline void
rb_vm_tag_jmpbuf_init(rb_vm_tag_jmpbuf_t *jmpbuf)
{
*jmpbuf = ruby_xmalloc(sizeof(rb_jmpbuf_t));
}
static inline void
rb_vm_tag_jmpbuf_deinit(const rb_vm_tag_jmpbuf_t *jmpbuf)
{
ruby_xfree(*jmpbuf);
}
#else #else
typedef rb_jmpbuf_t rb_vm_tag_jmpbuf_t; typedef rb_jmpbuf_t rb_vm_tag_jmpbuf_t;
#define RB_VM_TAG_JMPBUF_GET(jmpbuf) (jmpbuf) #define RB_VM_TAG_JMPBUF_GET(buf) (buf)
static inline void
rb_vm_tag_jmpbuf_init(rb_vm_tag_jmpbuf_t *jmpbuf)
{
// no-op
}
static inline void
rb_vm_tag_jmpbuf_deinit(const rb_vm_tag_jmpbuf_t *jmpbuf)
{
// no-op
}
#endif #endif
/* /*
@ -971,54 +992,6 @@ struct rb_vm_tag {
unsigned int lock_rec; unsigned int lock_rec;
}; };
#if defined(__wasm__) && !defined(__EMSCRIPTEN__)
static inline void
_rb_vm_tag_jmpbuf_deinit_internal(rb_vm_tag_jmpbuf_t jmpbuf)
{
rb_vm_tag_jmpbuf_t buf = jmpbuf;
while (buf != NULL) {
rb_vm_tag_jmpbuf_t next = buf->next;
ruby_xfree(buf);
buf = next;
}
}
static inline void
rb_vm_tag_jmpbuf_init(struct rb_vm_tag *tag)
{
if (tag->prev != NULL && tag->prev->buf->next != NULL) {
_rb_vm_tag_jmpbuf_deinit_internal(tag->prev->buf->next);
tag->prev->buf->next = NULL;
}
tag->buf = ruby_xmalloc(sizeof *tag->buf);
tag->buf->next = NULL;
if (tag->prev != NULL) {
tag->prev->buf->next = tag->buf;
}
}
static inline void
rb_vm_tag_jmpbuf_deinit(struct rb_vm_tag *tag)
{
if (tag->prev != NULL) {
tag->prev->buf->next = NULL;
}
_rb_vm_tag_jmpbuf_deinit_internal(tag->buf);
}
#else
static inline void
rb_vm_tag_jmpbuf_init(struct rb_vm_tag *tag)
{
// no-op
}
static inline void
rb_vm_tag_jmpbuf_deinit(struct rb_vm_tag *tag)
{
// no-op
}
#endif
STATIC_ASSERT(rb_vm_tag_buf_offset, offsetof(struct rb_vm_tag, buf) > 0); STATIC_ASSERT(rb_vm_tag_buf_offset, offsetof(struct rb_vm_tag, buf) > 0);
STATIC_ASSERT(rb_vm_tag_buf_end, STATIC_ASSERT(rb_vm_tag_buf_end,
offsetof(struct rb_vm_tag, buf) + sizeof(rb_vm_tag_jmpbuf_t) < offsetof(struct rb_vm_tag, buf) + sizeof(rb_vm_tag_jmpbuf_t) <