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

[PRISM] Fix up pm_compile_branch_condition issue with single insn iseqs

Browse Source
This commit is contained in:
Kevin Newton 2024-09-12 15:49:44 -04:00
parent 0960c8aacd
commit 2d495300e2
No known key found for this signature in database
GPG Key ID: 0EAD74C79EC73F26
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
prism_compile.c
View File

@ -995,14 +995,15 @@ again:
if (LIST_INSN_SIZE_ONE(cond_seq)) { if (LIST_INSN_SIZE_ONE(cond_seq)) {
INSN *insn = (INSN *) ELEM_FIRST_INSN(FIRST_ELEMENT(cond_seq)); INSN *insn = (INSN *) ELEM_FIRST_INSN(FIRST_ELEMENT(cond_seq));
if (insn->insn_id == BIN(putobject)) { if (insn->insn_id == BIN(putobject)) {
if (RTEST(insn->operands[0])) { if (RTEST(insn->operands[0])) {
ADD_INSNL(ret, cond, jump, then_label); PUSH_INSNL(ret, location, jump, then_label);
// maybe unreachable // maybe unreachable
return; return;
} }
else { else {
ADD_INSNL(ret, cond, jump, else_label); PUSH_INSNL(ret, location, jump, else_label);
return; return;
} }
} }
@ -5936,7 +5937,7 @@ pm_compile_scope_node(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_nod
bool trailing_comma = false; bool trailing_comma = false;
if (PM_NODE_TYPE_P(scope_node->ast_node, PM_CLASS_NODE) || PM_NODE_TYPE_P(scope_node->ast_node, PM_MODULE_NODE)) { if (PM_NODE_TYPE_P(scope_node->ast_node, PM_CLASS_NODE) || PM_NODE_TYPE_P(scope_node->ast_node, PM_MODULE_NODE)) {
ADD_TRACE(ret, RUBY_EVENT_CLASS); PUSH_TRACE(ret, RUBY_EVENT_CLASS);
} }
if (scope_node->parameters != NULL) { if (scope_node->parameters != NULL) {
@ -6822,7 +6823,7 @@ pm_compile_scope_node(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_nod
if (PM_NODE_TYPE_P(scope_node->ast_node, PM_CLASS_NODE) || PM_NODE_TYPE_P(scope_node->ast_node, PM_MODULE_NODE)) { if (PM_NODE_TYPE_P(scope_node->ast_node, PM_CLASS_NODE) || PM_NODE_TYPE_P(scope_node->ast_node, PM_MODULE_NODE)) {
const pm_node_location_t end_location = PM_NODE_END_LOCATION(scope_node->parser, scope_node->ast_node); const pm_node_location_t end_location = PM_NODE_END_LOCATION(scope_node->parser, scope_node->ast_node);
ADD_TRACE(ret, RUBY_EVENT_END); PUSH_TRACE(ret, RUBY_EVENT_END);
ISEQ_COMPILE_DATA(iseq)->last_line = end_location.line; ISEQ_COMPILE_DATA(iseq)->last_line = end_location.line;
} }