diff options
| author | Matt Valentine-House <matt@eightbitraptor.com> | 2023-11-08 22:05:51 +0000 |
|---|---|---|
| committer | Kevin Newton <kddnewton@gmail.com> | 2023-11-08 20:28:58 -0500 |
| commit | 5c8d2c2d4594a630187702f96e4de75aa5a31fa8 (patch) | |
| tree | a63f02fa107af0b75b2823f1e11d6029429c8ac7 | |
| parent | 201853f4e1ae87eedb5cd255a80b088a7a40c59e (diff) | |
| download | ruby-5c8d2c2d4594a630187702f96e4de75aa5a31fa8.tar.gz | |
[PRISM] Always lookup idERROR_INFO consistently.
We know where it is in the iseq local table, because we forced it using
`iseq_set_exception_local_table` when compiling the BEGIN_NODE, so we
can always look it up from the same place.
Co-Authored-By Peter Zhu <peter@peterzhu.ca>
| -rw-r--r-- | prism_compile.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/prism_compile.c b/prism_compile.c index 595b36f1e7..ec8f7d58a1 100644 --- a/prism_compile.c +++ b/prism_compile.c @@ -1585,11 +1585,6 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, pm_scope_node_t next_scope_node; pm_scope_node_init((pm_node_t *)begin_node->ensure_clause, &next_scope_node, scope_node, parser); - pm_constant_id_list_t locals; - pm_constant_id_list_init(&locals); - pm_constant_id_list_append(&locals, idERROR_INFO); - next_scope_node.locals = locals; - child_iseq = NEW_CHILD_ISEQ(next_scope_node, rb_str_new2("ensure in"), ISEQ_TYPE_ENSURE, lineno); @@ -3493,10 +3488,7 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, PM_COMPILE((pm_node_t *)scope_node->body); PM_POP; - // this loses precision, but in this case that doesn't matter... - pm_constant_id_t id_err_info = (pm_constant_id_t)ISEQ_BODY(iseq)->local_table[0]; - int local_index = pm_lookup_local_index_with_depth(iseq, scope_node, id_err_info, 0); - ADD_GETLOCAL(ret, &dummy_line_node, local_index, 0); + ADD_GETLOCAL(ret, &dummy_line_node, 1, 0); ADD_INSN1(ret, &dummy_line_node, throw, INT2FIX(0)); return; |