admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-compiler: update codegen to use variable node headers for debug info

Browse Source 
Updates codegen() function to retrieve filename and line number information
directly from variable-sized node headers instead of assuming traditional
head nodes. Removes dead code for traditional cons-list nodes since all
nodes are now variable-sized.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-09-24 14:51:27 +09:00
parent 76745161c5
commit 72e2b8e384
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+18 -18
View File
@@ -5613,7 +5613,6 @@ codegen(codegen_scope *s, node *tree, int val)
{
int nt;
int rlev = s->rlev;
struct mrb_ast_head_node *head;
if (!tree) {
if (val) {
@@ -5623,30 +5622,31 @@ codegen(codegen_scope *s, node *tree, int val)
return;
}
head = (struct mrb_ast_head_node*)tree;
nt = node_to_int(tree->car);
s->rlev++;
if (s->rlev > MRB_CODEGEN_LEVEL_MAX) {
codegen_error(s, "too complex expression");
}
if (s->irep && s->filename_index != head->filename_index) {
mrb_sym fname = mrb_parser_get_filename(s->parser, s->filename_index);
const char *filename = mrb_sym_name_len(s->mrb, fname, NULL);
if (filename) {
mrb_debug_info_append_file(s->mrb, s->irep->debug_info,
filename, s->lines, s->debug_start_pos, s->pc);
}
s->debug_start_pos = s->pc;
s->filename_index = head->filename_index;
s->filename_sym = mrb_parser_get_filename(s->parser, head->filename_index);
}
nt = node_to_int(tree->car);
s->lineno = head->lineno;
tree = tree->cdr;
if (nt == NODE_VARIABLE) {
/* For variable-sized nodes, get filename/lineno from the variable node header */
struct mrb_ast_var_header *var_head = (struct mrb_ast_var_header*)tree->cdr;
if (s->irep && s->filename_index != var_head->filename_index) {
mrb_sym fname = mrb_parser_get_filename(s->parser, s->filename_index);
const char *filename = mrb_sym_name_len(s->mrb, fname, NULL);
if (filename) {
mrb_debug_info_append_file(s->mrb, s->irep->debug_info,
filename, s->lines, s->debug_start_pos, s->pc);
}
s->debug_start_pos = s->pc;
s->filename_index = var_head->filename_index;
s->filename_sym = mrb_parser_get_filename(s->parser, var_head->filename_index);
}
s->lineno = var_head->lineno;
tree = tree->cdr;
/* Inlined codegen_variable_node() logic */
enum node_type var_type = VAR_NODE_TYPE(tree);