feat: simplify some of the column number logic

Author: ErosZy

src/core/parser.c

@@ -9543,16 +9543,6 @@ static __exception int resolve_variables(JSContext *ctx, JSFunctionDef *s)
 
       case OP_column_num:
         column_num = get_u32(bc_buf + pos + 1);
-        while(
-          bc_buf[pos_next] == OP_column_num 
-          && column_num == get_u32(bc_buf + pos_next + 1)
-        ) {
-          pos = pos_next;
-          op = bc_buf[pos];
-          len = opcode_info[op].size;
-          pos_next = pos + len;
-        }
-        
         s->column_number_size++;
         goto no_change;
       case OP_eval: /* convert scope index to adjusted variable index */
@@ -9861,11 +9851,13 @@ static void add_pc2col_info(JSFunctionDef *s, uint32_t pc, int column_num)
 {
   if(s->column_number_slots != NULL
      &&  s->column_number_count < s->column_number_size
-     &&  pc >= s->column_number_last_pc) {
+     &&  pc >= s->column_number_last_pc
+     &&  column_num != s->column_number_last) {
     s->column_number_slots[s->column_number_count].pc = pc;
     s->column_number_slots[s->column_number_count].column_num = column_num;
     s->column_number_count++;
     s->column_number_last_pc = pc;
+    s->column_number_last = column_num;
   }
 }
 
@@ -10149,6 +10141,7 @@ static __exception int resolve_labels(JSContext *ctx, JSFunctionDef *s)
     s->column_number_slots = js_mallocz(s->ctx, sizeof(*s->column_number_slots) * s->column_number_size);
     if(s->column_number_slots == NULL)
       return -1;
+    s->column_number_last = s->column_num;
     s->column_number_last_pc = 0;
   }
 

src/core/parser.h

@@ -319,6 +319,7 @@ typedef struct JSFunctionDef {
   int column_number_size;
   int column_number_count;
   int column_number_last_pc;
+  int column_number_last;
 
   /* pc2line table */
   JSAtom filename;

src/core/runtime.c

@@ -1180,18 +1180,17 @@ void build_backtrace(JSContext* ctx, JSValueConst error_obj, const char* filenam
       if (b->has_debug) {
         /* find line and column, default to 1:1 */
         line_num = find_line_num(ctx, b, sf->cur_pc - b->byte_code_buf - 1);
-        line_num = line_num == -1 ? 1 : line_num;
+        line_num = line_num == -1 ? b->debug.line_num : line_num;
         column_num = find_column_num(ctx, b, sf->cur_pc - b->byte_code_buf - 1);
-        column_num = column_num == -1 ? 1 : column_num + 1;
+        column_num = column_num == -1 ? b->debug.column_num : column_num + 1;
         atom_str = JS_AtomToCString(ctx, b->debug.filename);
         dbuf_printf(&dbuf, " (%s", atom_str ? atom_str : "<null>");
         JS_FreeCString(ctx, atom_str);
-        if (line_num != -1){
+        if (line_num != -1) {
           dbuf_printf(&dbuf, ":%d", line_num);
-        }
-
-        if (column_num != -1){
-          dbuf_printf(&dbuf, ":%d", column_num);
+          if (column_num != -1) {
+            dbuf_printf(&dbuf, ":%d", column_num);
+          }
         }
 
         dbuf_putc(&dbuf, ')');
@@ -1216,8 +1215,13 @@ void build_backtrace(JSContext* ctx, JSValueConst error_obj, const char* filenam
 
   dbuf_free(&dbuf);
   JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_stack, str, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
-  JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_lineNumber, JS_NewInt32(ctx, line_num), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
-  JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_columnNumber, JS_NewInt32(ctx, column_num), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+
+  if (line_num != -1) {
+    JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_lineNumber, JS_NewInt32(ctx, line_num), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    if (column_num != -1) {
+      JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_columnNumber, JS_NewInt32(ctx, column_num), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    }
+  }
 }
 
 /* Note: it is important that no exception is returned by this function */