jseption 0.0.5 → 0.0.6

package/dist/jit.d.ts

@@ -42,6 +42,7 @@ export interface JitCompiled {
 export interface JitSource {
     source: string;
     name: string;
+    ctor_names?: Map<number, string>;
     osr?: {
         arg_cell: boolean[];
         var_cell: boolean[];

package/dist/jit.js

@@ -1068,6 +1068,8 @@ class BlockEmitter {
         }
         this.emit(`$s${i} = ${p.code};`);
         this.slots[i] = P(temp_name(i), 1 /* PK.TEMP */, { fresh: p.fresh, mkeys: p.mkeys });
+        if (p.name !== undefined)
+            this.slots[i].name = p.name;
         this.see_temp(i);
     }
     /* materialize every pending expression that is not trivially duplicable, in order */
@@ -1211,17 +1213,26 @@ class BlockEmitter {
     /* before emitting a statement with side effects */
     before_stmt() { this.flush_exprs(); }
     /* --- variable access --- */
+    /* the source name of the argument or variable at vardefs[i] ('' when unknown) */
+    vardef_name(i) {
+        const vd = this.fi.b.vardefs[i];
+        return vd === undefined ? '' : this.fi.atom_name(vd.var_name);
+    }
     arg_read(i) {
         const fi = this.fi;
         if (i >= fi.argName.length)
             return P('undefined', 0 /* PK.LIT */);
-        return fi.argCell[i] ? P(`${fi.argName[i]}.get()`, 3 /* PK.EXPR */) : P(fi.argName[i], 2 /* PK.LOCAL */, { local: fi.argName[i] });
+        const p = fi.argCell[i] ? P(`${fi.argName[i]}.get()`, 3 /* PK.EXPR */) : P(fi.argName[i], 2 /* PK.LOCAL */, { local: fi.argName[i] });
+        p.name = this.vardef_name(i);
+        return p;
     }
     var_read(i) {
         const fi = this.fi;
         if (i >= fi.varName.length)
             bail(`bad local index ${i}`);
-        return fi.varCell[i] ? P(`${fi.varName[i]}.get()`, 3 /* PK.EXPR */) : P(fi.varName[i], 2 /* PK.LOCAL */, { local: fi.varName[i] });
+        const p = fi.varCell[i] ? P(`${fi.varName[i]}.get()`, 3 /* PK.EXPR */) : P(fi.varName[i], 2 /* PK.LOCAL */, { local: fi.varName[i] });
+        p.name = this.vardef_name(fi.b.arg_count + i);
+        return p;
     }
     write_local(is_arg, i, value) {
         const fi = this.fi;
@@ -1582,7 +1593,16 @@ class BlockEmitter {
                     /* `new C(args)`: new.target is the constructor itself */
                     this.pop();
                     this.pop();
-                    e = `new ${fn.code}${this.M()}(${args.join(', ')})${this.M()}`;
+                    /* every native construct site is recorded: a failure there is named after the callee
+                       the site stored in $C.last_new once its arguments ran (after the last one, so a nested
+                       `new` in an argument cannot overwrite it) */
+                    this.fi.ctor_names.set(this.cur_pc, fn.name ?? '');
+                    if (args.length > 0)
+                        this.fi.uses_nw = true;
+                    const store = `$C.last_new = ${fn.code}`;
+                    const n = args.length;
+                    const argv = n === 0 ? [] : [...args.slice(0, n - 1), `($nw = ${args[n - 1]}, ${store}, $nw)`];
+                    e = n === 0 ? `(${store}, new ${fn.code}${this.M()}()${this.M()})` : `new ${fn.code}${this.M()}(${argv.join(', ')})${this.M()}`;
                 }
                 else {
                     const t = this.dup_code(this.depth - 1);
@@ -1682,7 +1702,9 @@ class BlockEmitter {
                 fi.uses_global = true;
                 const slow = `$RT.get_global(${insn.a}, ${op === 57 /* OP.get_var */})`;
                 const g = op === 57 /* OP.get_var */ ? `(($g = $G${acc}) !== undefined ? $g : ${slow})` : `$G${acc}`;
-                this.push(P(`(($g = $GV${acc}) !== undefined ? ($g === $U ? ${slow} : $g) : ${g})`, 3 /* PK.EXPR */));
+                const pv = P(`(($g = $GV${acc}) !== undefined ? ($g === $U ? ${slow} : $g) : ${g})`, 3 /* PK.EXPR */);
+                pv.name = fi.atom_name(insn.a);
+                this.push(pv);
                 return false;
             }
             case 58 /* OP.put_var */:
@@ -1813,9 +1835,14 @@ class BlockEmitter {
             case 223 /* OP.get_var_ref0 */:
             case 224 /* OP.get_var_ref1 */:
             case 225 /* OP.get_var_ref2 */:
-            case 226 /* OP.get_var_ref3 */:
-                this.push(P(`$vr[${insn.a}].get()`, 3 /* PK.EXPR */));
+            case 226 /* OP.get_var_ref3 */: {
+                const pv = P(`$vr[${insn.a}].get()`, 3 /* PK.EXPR */);
+                const cv = fi.b.closure_var[insn.a];
+                if (cv !== undefined)
+                    pv.name = fi.atom_name(cv.var_name);
+                this.push(pv);
                 return false;
+            }
             case 96 /* OP.put_var_ref */:
             case 227 /* OP.put_var_ref0 */:
             case 228 /* OP.put_var_ref1 */:
@@ -1840,7 +1867,11 @@ class BlockEmitter {
                 const d = this.depth;
                 this.before_stmt();
                 this.emit(`$s${d} = $vr[${insn.a}].get(); if ($s${d} === $U) $RT.throw_uninitialized($b, ${insn.a}, true);`);
-                this.push(P(`$s${d}`, 1 /* PK.TEMP */));
+                const pv = P(`$s${d}`, 1 /* PK.TEMP */);
+                const cv = fi.b.closure_var[insn.a];
+                if (cv !== undefined)
+                    pv.name = fi.atom_name(cv.var_name);
+                this.push(pv);
                 return false;
             }
             case 104 /* OP.put_var_ref_check */: {
@@ -1863,7 +1894,9 @@ class BlockEmitter {
                 const d = this.depth;
                 this.before_stmt();
                 this.emit(`$s${d} = ${this.local_value(false, insn.a)}; if ($s${d} === $U) $RT.throw_uninitialized($b, ${insn.a}, false);`);
-                this.push(P(`$s${d}`, 1 /* PK.TEMP */));
+                const pv = P(`$s${d}`, 1 /* PK.TEMP */);
+                pv.name = this.vardef_name(fi.b.arg_count + insn.a);
+                this.push(pv);
                 return false;
             }
             case 100 /* OP.put_loc_check */: {
@@ -2023,7 +2056,10 @@ class BlockEmitter {
             case 66 /* OP.get_field */: {
                 const o = this.dup_code(this.depth - 1);
                 this.pop();
-                this.push(P(this.get_field(o, insn.a), 3 /* PK.EXPR */));
+                const pv = P(this.get_field(o, insn.a), 3 /* PK.EXPR */);
+                if (!fi.atom_is_symbol(insn.a))
+                    pv.name = fi.atom_name(insn.a);
+                this.push(pv);
                 return false;
             }
             case 67 /* OP.get_field2 */: {
@@ -3029,7 +3065,7 @@ export function jit_generate_source(ctx, b, id = 0, opts = {}) {
     const fi = {
         ctx, b, A, strict, constructible, derived: b.is_derived_class_constructor, uses_direct: false, uses_global: false, uses_w: false,
         natural: (opts.conv ?? jit_config.conv) === 'natural', arg_off: (opts.conv ?? jit_config.conv) === 'natural' ? 0 : 2,
-        sloppy_sets: new Map(), sloppy_props: new Map(), uses_spe: false, uses_sdel: false,
+        sloppy_sets: new Map(), sloppy_props: new Map(), uses_spe: false, uses_sdel: false, ctor_names: new Map(), uses_nw: false,
         argName: [], argCell: [], varName: [], varCell: [],
         atom_name: (atom) => JS_AtomGetStr(ctx, atom),
         atom_is_symbol: (atom) => ctx.rt.atoms.isSymbol(atom),
@@ -3110,6 +3146,8 @@ export function jit_generate_source(ctx, b, id = 0, opts = {}) {
         decls.push('$g');
     if (fi.uses_w)
         decls.push('$w');
+    if (fi.uses_nw)
+        decls.push('$nw');
     const params = ['$t', '$nt'];
     const fwparams = [];
     for (let i = 0; i < b.arg_count; i++) {
@@ -3222,7 +3260,7 @@ ${prologue}${body}};
     }
     /* the url names the function for host stack traces; its id leads to the position table */
     source += `\n//# sourceURL=jseption:${id}:${url_part(jit_file_name(ctx, b))}:${url_part(name || '<anonymous>')}`;
-    const res = { source, name };
+    const res = { source, name, ctor_names: fi.ctor_names };
     if (osr !== undefined)
         res.osr = { arg_cell: fi.argCell.slice(), var_cell: fi.varCell.slice(), depth: cfg.byPc.get(osr).stateIn.length };
     return res;
@@ -3281,7 +3319,7 @@ function compile_variant(ctx, b, opts) {
     try {
         const id = jit_stack_alloc_id();
         const gen = jit_generate_source(ctx, b, id, opts);
-        const { source, name } = gen;
+        const { source, name, ctor_names } = gen;
         if (jit_config.dump)
             console.log(`--- jit${opts.osr !== undefined ? ` (osr at ${opts.osr})` : opts.conv === 'forwarder' && jit_config.conv !== 'forwarder' ? ' (ctor)' : ''}: ${name || '<anonymous>'} ---\n${source}`);
         const RT = make_jit_runtime(ctx, (bb) => jit_closure_compile(ctx, bb));
@@ -3297,7 +3335,7 @@ function compile_variant(ctx, b, opts) {
             throw e;
         }
         const make = factory(...jit_runtime_factory_args(RT, b));
-        const stack = { b, name, file: jit_file_name(ctx, b), source, lines: null };
+        const stack = { b, name, file: jit_file_name(ctx, b), source, lines: null, ctor_names: ctor_names ?? null };
         jit_stack_register(id, stack);
         const compiled = { make, source, name, stack, osr: gen.osr };
         jit_stats.compiled++;