diff options
| author | Kevin Newton <[email protected]> | 2024-07-23 10:15:21 -0400 |
|---|---|---|
| committer | Kevin Newton <[email protected]> | 2024-07-23 12:48:48 -0400 |
| commit | b6800515e8c6af992183045ba89147e90eab3c55 () | |
| tree | cb4758e3d93f45c18b53aa47963cf0ff286064d3 /prism_compile.c | |
| parent | e9ae93902119b8258b6f4595c6b58d8209829740 (diff) | |
[PRISM] Fix up ensure compilation, match compile.c
Notes: Merged: https://.com/ruby/ruby/pull/11228
| -rw-r--r-- | prism_compile.c | 57 |
1 files changed, 31 insertions, 26 deletions
@@ -4741,7 +4741,8 @@ pm_compile_rescue(rb_iseq_t *iseq, const pm_begin_node_t *cast, const pm_node_lo PM_COMPILE_NOT_POPPED((const pm_node_t *) cast->statements); } else { - PUSH_SYNTHETIC_PUTNIL(ret, iseq); } ISEQ_COMPILE_DATA(iseq)->in_rescue = prev_in_rescue; @@ -4774,34 +4775,44 @@ pm_compile_ensure(rb_iseq_t *iseq, const pm_begin_node_t *cast, const pm_node_lo location = *node_location; } - LABEL *estart = NEW_LABEL(location.line); - LABEL *eend = NEW_LABEL(location.line); - LABEL *econt = NEW_LABEL(location.line); struct ensure_range er; struct iseq_compile_data_ensure_node_stack enl; struct ensure_range *erange; - er.begin = estart; - er.end = eend; er.next = 0; push_ensure_entry(iseq, &enl, &er, (void *) cast->ensure_clause); - PUSH_LABEL(ret, estart); - if (cast->rescue_clause) { - pm_compile_rescue(iseq, cast, &location, ret, popped, scope_node); } - else { - if (cast->statements) { - PM_COMPILE((const pm_node_t *) cast->statements); - } - else if (!popped) { - PUSH_INSN(ret, *node_location, putnil); - } } - PUSH_LABEL(ret, eend); - PUSH_LABEL(ret, econt); pm_scope_node_t next_scope_node; pm_scope_node_init((const pm_node_t *) cast->ensure_clause, &next_scope_node, scope_node); @@ -4816,19 +4827,13 @@ pm_compile_ensure(rb_iseq_t *iseq, const pm_begin_node_t *cast, const pm_node_lo pm_scope_node_destroy(&next_scope_node); erange = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->erange; - if (estart->link.next != &eend->link) { while (erange) { - PUSH_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end, child_iseq, econt); erange = erange->next; } } ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl.prev; - - // Compile the ensure entry - if (statements != NULL) { - PM_COMPILE((const pm_node_t *) statements); - if (!popped) PUSH_INSN(ret, *node_location, pop); - } } /** |