diff options
| author | nagachika <nagachika@ruby-lang.org> | 2021-11-24 12:03:46 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-11-24 12:03:46 +0900 |
| commit | 7b3948750e1b1dd8cb271c0a7377b911bb3b8f1b (patch) | |
| tree | b07091327cf0ca7a163a38d9c47932be32592b71 /vm_method.c | |
| parent | 949af69408e44b69cc7437b58e8edbe3cd77c966 (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_method.c')
| -rw-r--r-- | vm_method.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_method.c b/vm_method.c index e55fc4697c..7fc3f8db97 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1482,7 +1482,7 @@ static void scope_visibility_check(void) { /* Check for public/protected/private/module_function called inside a method */ - rb_control_frame_t *cfp = rb_current_execution_context()->cfp+1; + rb_control_frame_t *cfp = GET_EC()->cfp+1; if (cfp && cfp->iseq && cfp->iseq->body->type == ISEQ_TYPE_METHOD) { rb_warn("calling %s without arguments inside a method may not have the intended effect", rb_id2name(rb_frame_this_func())); |