summaryrefslogtreecommitdiff
path: root/vm_trace.c
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2021-11-24 12:03:46 +0900
committernagachika <nagachika@ruby-lang.org>2021-11-24 12:03:46 +0900
commit7b3948750e1b1dd8cb271c0a7377b911bb3b8f1b (patch)
treeb07091327cf0ca7a163a38d9c47932be32592b71 /vm_trace.c
parent949af69408e44b69cc7437b58e8edbe3cd77c966 (diff)
merge revision(s) e1b03b0c2b2449a7794f4701bab8b2382eb15116,007e439fe965871c73127928f7244ebb96a86e58:
Enable VM_ASSERT in --jit CIs (#4543) --- .github/workflows/mjit.yml | 2 +- ractor.c | 6 +++--- vm_core.h | 6 +++--- vm_method.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) Do not expect ec on rb_vm_bugreport because a SEGV might happen on an MJIT worker. As you can clearly see from `if (vm && ec) {`, ec is not guaranteed to exist here. --- vm_dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Diffstat (limited to 'vm_trace.c')
-rw-r--r--vm_trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_trace.c b/vm_trace.c
index bb4fdefd7c..6cbb5ed843 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -1595,7 +1595,7 @@ postponed_job_register(rb_execution_context_t *ec, rb_vm_t *vm,
static rb_execution_context_t *
get_valid_ec(rb_vm_t *vm)
{
- rb_execution_context_t *ec = rb_current_execution_context();
+ rb_execution_context_t *ec = rb_current_execution_context(false);
if (ec == NULL) ec = rb_vm_main_ractor_ec(vm);
return ec;
}