Skip to content

[BugFix] fix wrong line number in stacktrace #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[BugFix] fix wrong line number in stacktrace #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/interpreter/quickjs/include/quickjs-inner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2336,6 +2336,7 @@ QJS_HIDE int js_parse_string(JSParseState *s, int sep, BOOL do_throw,
QJS_HIDE int cpool_add(JSParseState *s, LEPUSValue val);
QJS_HIDE int emit_push_const(JSParseState *s, LEPUSValueConst val,
BOOL as_atom);
QJS_HIDE void emit_line_num(JSParseState *s, bool is_get_var);
QJS_HIDE void emit_op(JSParseState *s, uint8_t val);
QJS_HIDE int emit_label(JSParseState *s, int label);
QJS_HIDE void emit_return(JSParseState *s, BOOL hasval);
Expand Down
27 changes: 15 additions & 12 deletions src/interpreter/quickjs/source/quickjs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20812,22 +20812,19 @@ QJS_STATIC void emit_u32(JSParseState *s, uint32_t val) {
dbuf_put_u32(&s->cur_func->byte_code, val);
}

void emit_line_num(JSParseState *s, bool is_get_var) {
JSFunctionDef *fd = s->cur_func;
DynBuf *bc = &fd->byte_code;

int64_t result = compute_column(s, is_get_var); // val == OP_scope_get_var
dbuf_putc(bc, OP_line_num);
dbuf_put_u64(bc, result);
}

void emit_op(JSParseState *s, uint8_t val) {
JSFunctionDef *fd = s->cur_func;
DynBuf *bc = &fd->byte_code;

/* Use the line number of the last token used, not the next token,
nor the current offset in the source file.
*/
// <Primjs begin>
if (unlikely(s->last_emit_ptr != s->last_ptr)) {
int64_t result = compute_column(s, val == OP_scope_get_var);
dbuf_putc(bc, OP_line_num);
dbuf_put_u64(bc, result);
s->last_emit_ptr = s->last_ptr;
fd->last_opcode_line_num = s->last_line_num;
}
// <Primjs end>
fd->last_opcode_pos = bc->size;
dbuf_putc(bc, val);
}
Expand Down Expand Up @@ -23661,6 +23658,7 @@ QJS_STATIC __exception int js_parse_postfix_expr(JSParseState *s,
if (next_token(s)) /* update line number before emitting code */
return -1;
do_get_var:
emit_line_num(s, true);
emit_op(s, OP_scope_get_var);
emit_u32(s, name);
emit_u16(s, s->cur_func->scope_level);
Expand Down Expand Up @@ -23694,6 +23692,7 @@ QJS_STATIC __exception int js_parse_postfix_expr(JSParseState *s,
emit_atom(s, JS_ATOM_new_target);
emit_u16(s, 0);
} else {
emit_line_num(s, false);
caller_start = s->token.ptr;
if (js_parse_postfix_expr(s, FALSE | PF_LASTEST_ISNEW)) return -1;
is_parsing_newnew_pattern = parse_flags & PF_LASTEST_ISNEW;
Expand Down Expand Up @@ -23791,6 +23790,7 @@ QJS_STATIC __exception int js_parse_postfix_expr(JSParseState *s,

if (call_type == FUNC_CALL_NORMAL) {
parse_func_call2:
emit_line_num(s, false);
switch (opcode = get_prev_opcode(fd)) {
case OP_get_field:
/* keep the object on the stack */
Expand Down Expand Up @@ -24429,6 +24429,7 @@ QJS_STATIC __exception int js_parse_expr_binary(JSParseState *s, int level,
abort();
}
if (next_token(s)) return -1;
emit_line_num(s, false);
if (js_parse_expr_binary(s, level - 1, parse_flags & ~PF_ARROW_FUNC))
return -1;
emit_op(s, opcode);
Expand Down Expand Up @@ -25345,6 +25346,7 @@ QJS_STATIC __exception int js_parse_statement_or_decl(JSParseState *s,
js_parse_error(s, "line terminator not allowed after throw");
goto fail;
}
emit_line_num(s, false);
if (js_parse_expr(s)) goto fail;
emit_op(s, OP_throw);
if (js_parse_expect_semi(s)) goto fail;
Expand Down Expand Up @@ -25918,6 +25920,7 @@ QJS_STATIC __exception int js_parse_statement_or_decl(JSParseState *s,

default:
hasexpr:
emit_line_num(s, false);
if (js_parse_expr(s)) goto fail;
if (s->cur_func->eval_ret_idx >= 0) {
/* store the expression value so that it can be returned
Expand Down
5 changes: 5 additions & 0 deletions src/interpreter/quickjs/source/quickjs_gc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12489,6 +12489,7 @@ static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags) {
if (next_token(s)) /* update line number before emitting code */
return -1;
do_get_var:
emit_line_num(s, true);
emit_op(s, OP_scope_get_var);
emit_u32(s, name);
emit_u16(s, s->cur_func->scope_level);
Expand Down Expand Up @@ -12522,6 +12523,7 @@ static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags) {
emit_atom(s, JS_ATOM_new_target);
emit_u16(s, 0);
} else {
emit_line_num(s, false);
caller_start = s->token.ptr;
if (js_parse_postfix_expr(s, FALSE | PF_LASTEST_ISNEW)) return -1;
caller_end = s->token.ptr;
Expand Down Expand Up @@ -12620,6 +12622,7 @@ static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags) {

if (call_type == FUNC_CALL_NORMAL) {
parse_func_call2:
emit_line_num(s, false);
switch (opcode = get_prev_opcode(fd)) {
case OP_get_field:
/* keep the object on the stack */
Expand Down Expand Up @@ -13477,6 +13480,7 @@ static __exception int js_parse_statement_or_decl(JSParseState *s,
js_parse_error(s, "line terminator not allowed after throw");
goto fail;
}
emit_line_num(s, false);
if (js_parse_expr(s)) goto fail;
emit_op(s, OP_throw);
if (js_parse_expect_semi(s)) goto fail;
Expand Down Expand Up @@ -14052,6 +14056,7 @@ static __exception int js_parse_statement_or_decl(JSParseState *s,

default:
hasexpr:
emit_line_num(s, false);
if (js_parse_expr(s)) goto fail;
if (s->cur_func->eval_ret_idx >= 0) {
/* store the expression value so that it can be returned
Expand Down
Loading