circle-ir 4.16.1 → 4.18.1

package/dist/navigation/navigation-index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation-index.d.ts","sourceRoot":"","sources":["../../src/navigation/navigation-index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAoC,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACvG,OAAO,KAAK,EAGV,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,YAAY,EAIb,MAAM,YAAY,CAAC;AAEpB,2FAA2F;AAC3F,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,EAAE,EAAE,QAAQ,CAAC;IACb,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uFAAuF;IACvF,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtD,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAkND,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,GAAE,YAAiB,GACzB,eAAe,CAEjB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmC;IACrE,yFAAyF;IACzF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,4DAA4D;IAC5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgB;IAChD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,yCAAyC;IACzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,mFAAmF;IACnF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuC;IAChE,4DAA4D;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;IAEtE,YAAY,KAAK,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,YAAY,EA4DzD;IAID;;;;;;;;;;;;OAYG;IACH,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,GAAE,YAAiB,GAAG,gBAAgB,CAiHtE;IAED,uEAAuE;IACvE,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,GAAE,YAAiB,GAAG,gBAAgB,CA8CtE;IAED;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CACN,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,SAAS,GACd,MAAM,GAAG,SAAS,CAapB;IAID,wEAAwE;IACxE,OAAO,CAAC,YAAY;IASpB;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ;IAUhB,OAAO,CAAC,YAAY;IAwEpB,uFAAuF;IACvF,OAAO,CAAC,UAAU;IA8BlB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,OAAO;IA4Bf,2FAA2F;IAC3F,OAAO,CAAC,eAAe;IAqCvB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAwBxB,8EAA8E;IAC9E,OAAO,CAAC,iBAAiB;IAKzB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,cAAc;IAiDtB,mFAAmF;IACnF,OAAO,CAAC,UAAU;IAqBlB,mFAAmF;IACnF,OAAO,CAAC,YAAY;IAQpB;;;OAGG;IACH,OAAO,CAAC,IAAI;IAkCZ,uFAAuF;IACvF,OAAO,CAAC,OAAO;IA2Cf,iDAAiD;IACjD,OAAO,CAAC,iBAAiB;IAKzB,2CAA2C;IAC3C,OAAO,CAAC,YAAY;IAIpB,8FAA8F;IAC9F,OAAO,CAAC,YAAY;IAiCpB,mEAAmE;IACnE,OAAO,CAAC,cAAc;IAStB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IA2BpB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAwB3B;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IA4ClB,6EAA6E;IAC7E,OAAO,CAAC,MAAM;IAad,8DAA8D;IAC9D,OAAO,CAAC,OAAO;IA0Bf,8EAA8E;IAC9E,OAAO,CAAC,gBAAgB;IAgBxB,0EAA0E;IAC1E,OAAO,CAAC,WAAW;IAgBnB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAsBxB,4EAA4E;IAC5E,OAAO,CAAC,cAAc;IAiCtB,kEAAkE;IAClE,OAAO,CAAC,SAAS;IAmBjB,yEAAyE;IACzE,OAAO,CAAC,aAAa;IAuBrB;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAqCtB;;;;;;;;OAQG;IACH,OAAO,CAAC,gBAAgB;IAkDxB;;;OAGG;IACH,OAAO,CAAC,YAAY;IAOpB,gEAAgE;IAChE,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,eAAe;IAIvB,iEAAiE;IACjE,OAAO,CAAC,eAAe;IASvB,6FAA6F;IAC7F,OAAO,CAAC,QAAQ;IAahB,uEAAuE;IACvE,OAAO,CAAC,sBAAsB;IAoB9B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,UAAU;IASlB;;;;;;;;;OASG;IACH,OAAO,CAAC,gBAAgB;IAkBxB,iFAAiF;IACjF,OAAO,CAAC,YAAY;IASpB,+EAA+E;IAC/E,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,eAAe;IAsBvB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS;IAuCjB,oEAAoE;IACpE,OAAO,CAAC,gBAAgB;IA+BxB,2EAA2E;IAC3E,OAAO,CAAC,yBAAyB;IASjC,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,MAAM;IAMd,2DAA2D;IAC3D,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,WAAW;IAqBnB,OAAO,CAAC,MAAM;IAYd,OAAO,CAAC,MAAM;CA6Cf"}
+{"version":3,"file":"navigation-index.d.ts","sourceRoot":"","sources":["../../src/navigation/navigation-index.ts"],"names":[],"mappings":"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"}

package/dist/navigation/navigation-index.js

@@ -56,6 +56,8 @@ const REFLECTIVE_METHODS = new Set([
     'getDeclaredConstructor', 'newProxyInstance', 'getAnnotation',
     'getAnnotationsByType', 'isAnnotationPresent', 'getGenericReturnType',
 ]);
+/** What every class inherits from `java.lang.Object`. */
+const OBJECT_METHODS = new Set(['toString', 'hashCode', 'equals', 'getClass', 'clone', 'finalize', 'notify', 'notifyAll', 'wait']);
 const LOMBOK_ACCESSOR = new Set(['Getter', 'Setter', 'Data', 'Value']);
 const LOMBOK_BUILDER = new Set(['Builder', 'SuperBuilder']);
 const PRIMITIVES = new Set(['byte', 'short', 'char', 'int', 'long', 'float', 'double', 'boolean']);
@@ -114,7 +116,7 @@ const JAVA_LANG = new Set([
     'Object', 'Number', 'Class', 'StringBuilder', 'CharSequence', 'Comparable', 'Iterable', 'Enum',
 ]);
 /** Bumped when the shape of a cached per-file record changes. */
-const CACHE_VERSION = 'nav-3';
+const CACHE_VERSION = 'nav-4';
 const fileCache = new Map();
 export function buildNavigationIndex(files, options = {}) {
     return new NavigationIndex(files, options);
@@ -231,6 +233,15 @@ export class NavigationIndex {
                     `declared: ${declared.map(o => `${q.base}${signatureOf(o)}`).join(', ')}`;
             return this.finish('callers', query, answers, unresolved, t0, opts, extra);
         }
+        if (target && declared.length === 0 && q.name !== '<init>' && this.visibleOverloads(target.fqn, q.name).length === 0) {
+            // `MapIterator.toString()`: the type is in the tree, the method is
+            // not — it is inherited from outside, so no call site can bind to the
+            // query's target, and "no callers" would read as a finding.
+            extra.note =
+                `${q.owner} declares no method ${q.name}, and no supertype in the searched tree does: it is inherited from ` +
+                    `${OBJECT_METHODS.has(q.name) ? 'java.lang.Object' : 'a type outside the tree'}, so no call site here binds to ${q.base}. ` +
+                    `A call reached only through string conversion or library code has no call site at all.`;
+        }
         const wantedSet = new Set(wanted);
         const dispatchOpen = target !== undefined && q.name !== '<init>' && wanted.some(o => this.dispatchIsOpen(target, o));
         for (const rec of this.files.values()) {
@@ -371,6 +382,78 @@ export class NavigationIndex {
         }
         return this.finish('callees', query, answers, unresolved, t0, opts);
     }
+    /**
+     * Every call site in the index, bound — the whole-program view of what
+     * `resolveCallees` answers one method at a time, with each target located
+     * by file and declaration line so a caller can key it to its own
+     * declaration ids. Additive: no query path changes.
+     *
+     * A `bound` site names the member its receiver's static type declares
+     * (`declaring`) and, on `polymorphic`, every body that could run
+     * (`bodies`, the overload with the declaring member's signature where it
+     * has one). Anything else is `unresolved` with the same reason a query
+     * would give.
+     */
+    callSites() {
+        const out = [];
+        const files = [...this.files.values()].sort((a, b) => (a.path < b.path ? -1 : a.path > b.path ? 1 : 0));
+        for (const rec of files) {
+            for (const call of rec.calls) {
+                const site = { file: rec.path, line: call.location.line, col: call.location.column };
+                const b = this.bindCall(call, rec);
+                if (b?.kind === 'bound') {
+                    const bodies = [];
+                    if (b.result.tier === 'polymorphic') {
+                        const sig = b.overload ? signatureOf(b.overload) : null;
+                        for (const c of b.result.candidates ?? []) {
+                            const dot = c.lastIndexOf('.');
+                            const t = this.typesByFqn.get(c.slice(0, dot));
+                            const name = c.slice(dot + 1);
+                            if (!t)
+                                continue;
+                            const all = this.declaredOverloads(t, name);
+                            const pick = sig ? all.filter(o => signatureOf(o) === sig) : all;
+                            for (const o of pick.length > 0 ? pick : all)
+                                bodies.push({ file: t.file, line: o.startLine, name, fqn: c });
+                        }
+                    }
+                    out.push({ site, methodName: call.method_name, kind: 'bound', tier: b.result.tier, declaring: this.targetOf(b.owner, b.name, b.overload), bodies });
+                }
+                else {
+                    const reason = b?.kind === 'ambiguous' ? 'overload-ambiguous' : this.reasonFor(call, rec);
+                    const receiver = reason === 'external' ? this.foreignTypeOf(call, rec) : undefined;
+                    out.push({ site, methodName: call.method_name, kind: 'unresolved', reason, ...(receiver ? { receiver } : {}) });
+                }
+            }
+        }
+        return out;
+    }
+    /** The type outside the tree an `external` site lands on: its receiver, the constructed type, or a static import's owner. */
+    foreignTypeOf(call, rec) {
+        let name;
+        if (call.is_constructor)
+            name = call.receiver_type_fqn ?? call.receiver_type ?? call.method_name;
+        else if (call.receiver === null && !call.receiver_type)
+            name = rec.staticImports.get(call.method_name);
+        else {
+            const t = this.receiverTypeOf(call, rec);
+            if (t?.kind === 'foreign')
+                name = t.name;
+        }
+        const bare = name?.replace(/<.*>$/, '').replace(/\[\]$/, '').trim();
+        if (!bare)
+            return undefined;
+        return bare.includes('.') ? bare : rec.imports.get(bare) ?? bare;
+    }
+    targetOf(owner, name, overload) {
+        if (overload)
+            return { file: owner.file, line: overload.startLine, name: overload.isConstructor ? '<init>' : name, fqn: memberName(owner, overload) };
+        const m = name === '<init>' ? undefined : owner.methods.get(name);
+        if (m)
+            return { file: owner.file, line: m.startLine, name, fqn: `${owner.fqn}.${name}` };
+        // A constructor the type does not declare: the type itself.
+        return { file: owner.file, line: owner.startLine, name: owner.simpleName, fqn: owner.fqn, type: true };
+    }
     /**
      * The symbol a call site names, so a caller holding a line of code can ask
      * the same question as a caller holding a name.
@@ -454,7 +537,7 @@ export class NavigationIndex {
             const encl = this.enclosingTypeOf(call, rec);
             const sup = encl?.extendsName ? this.resolveTypeName(encl.extendsName, rec) : undefined;
             if (sup && this.typesByFqn.has(sup)) {
-                return this.bindInType(sup, call, rec, depth, `super call inside ${encl.fqn}`, sup);
+                return this.bindInType(sup, call, rec, depth, `super call inside ${encl.fqn}`, sup, true);
             }
             return undefined;
         }
@@ -500,7 +583,7 @@ export class NavigationIndex {
         return undefined;
     }
     /** Bind `call` to a member of `fqn` or of a supertype of it, choosing the overload. */
-    bindInType(fqn, call, rec, depth, evidence, receiver) {
+    bindInType(fqn, call, rec, depth, evidence, receiver, nonVirtual = false) {
         const cands = this.visibleOverloads(fqn, call.method_name);
         if (cands.length === 0)
             return undefined;
@@ -520,8 +603,8 @@ export class NavigationIndex {
             overload,
             receiver,
             result: overloaded
-                ? this.tierFor(owner, call.method_name, overload, `${evidence}; ${sel.how}`, true)
-                : this.tierFor(owner, call.method_name, overload, evidence),
+                ? this.tierFor(owner, call.method_name, overload, `${evidence}; ${sel.how}`, true, nonVirtual)
+                : this.tierFor(owner, call.method_name, overload, evidence, false, nonVirtual),
         };
     }
     /**
@@ -535,11 +618,14 @@ export class NavigationIndex {
      * the first; what runs there is a subclass's body or a lambda, never the
      * member named. The target stays the declaring member, which is what a
      * static resolver answers; only the tier changes.
+     *
+     * A `super.m()` call is not dispatched: it runs the body it names, whatever
+     * overrides it below.
      */
-    tierFor(owner, method, overload, evidence, overloaded = false) {
+    tierFor(owner, method, overload, evidence, overloaded = false, nonVirtual = false) {
         const impls = this.implementorsWith(owner.fqn, overload);
         const bodyless = this.isBodyless(owner, overload);
-        if (impls.length > 1 || bodyless) {
+        if ((impls.length > 1 && !nonVirtual) || bodyless) {
             return {
                 target: `${owner.fqn}.${method}`,
                 tier: 'polymorphic',
@@ -652,11 +738,16 @@ export class NavigationIndex {
         if (byArity.length === 0)
             return { kind: 'none' };
         const args = call.arguments.map(a => this.argumentType(a, call, rec, depth));
+        // An implicit, `this.` or `super.` receiver is the enclosing type itself,
+        // which fixes what the declaring type's variables are.
+        const self = call.receiver === null || call.receiver === 'this' || call.receiver === 'super'
+            ? this.enclosingTypeOf(call, rec)
+            : undefined;
         if (byArity.length === 1) {
             // The only declaration in the tree at this arity, but the argument
             // types certainly rule it out: what is called is an overload this
             // index cannot see, inherited from a library type. Not ours.
-            if ([1, 2, 3].every(p => this.applicable(byArity[0], args, p) === 'no'))
+            if ([1, 2, 3].every(p => this.applicable(byArity[0], args, p, self) === 'no'))
                 return { kind: 'none' };
             return {
                 kind: 'one',
@@ -666,7 +757,7 @@ export class NavigationIndex {
         }
         const fit = new Map();
         for (const c of byArity)
-            fit.set(c, [1, 2, 3].map(p => this.applicable(c, args, p)));
+            fit.set(c, [1, 2, 3].map(p => this.applicable(c, args, p, self)));
         const possible = byArity.filter(c => fit.get(c).some(f => f !== 'no'));
         if (possible.length === 1) {
             return {
@@ -686,7 +777,7 @@ export class NavigationIndex {
             const C = P.filter(c => fit.get(c)[phase - 1] === 'yes');
             if (C.length === 0)
                 return { kind: 'ambiguous', candidates: possible };
-            const best = C.find(m => P.every(o => o === m || this.moreSpecific(m, o, phase)));
+            const best = C.find(m => P.every(o => o === m || this.moreSpecific(m, o, phase, self)));
             if (best) {
                 return {
                     kind: 'one',
@@ -699,10 +790,9 @@ export class NavigationIndex {
         return { kind: 'ambiguous', candidates: possible };
     }
     /** Whether `c` applies to arguments of these types in compiler phase 1, 2 or 3. */
-    applicable(c, args, phase) {
+    applicable(c, args, phase, self) {
         const o = c.overload;
-        const declRec = this.files.get(c.owner.file);
-        const params = o.params.map(p => this.typeRef(p, declRec));
+        const params = this.paramRefsFrom(c, self);
         let worst = 'yes';
         const meet = (f) => {
             if (f === 'no')
@@ -718,17 +808,16 @@ export class NavigationIndex {
         }
         if (!o.varargs || args.length < params.length - 1)
             return 'no';
-        const last = params[params.length - 1];
-        const elem = { ...last, dims: Math.max(0, last.dims - 1) };
+        const elem = elementOf(params[params.length - 1]);
         args.forEach((a, i) => meet(this.fits(a, i < params.length - 1 ? params[i] : elem, 2)));
         return worst;
     }
     /** `m` is more specific than `o`: each of its parameter types fits the other's. */
-    moreSpecific(m, o, phase) {
+    moreSpecific(m, o, phase, self) {
         if (phase === 3)
             return false;
-        const mp = m.overload.params.map(p => this.typeRef(p, this.files.get(m.owner.file)));
-        const op = o.overload.params.map(p => this.typeRef(p, this.files.get(o.owner.file)));
+        const mp = this.paramRefsFrom(m, self);
+        const op = this.paramRefsFrom(o, self);
         if (mp.length !== op.length)
             return false;
         return mp.every((t, i) => this.fits(t, op[i], 1) === 'yes');
@@ -740,12 +829,42 @@ export class NavigationIndex {
     fits(a, p, phase) {
         if (!a)
             return 'maybe';
-        if (p.typeVar)
+        if (p.opaque) {
+            if (a.simple === 'null' && a.dims === 0)
+                return 'yes';
+            if (a.typeVar)
+                return a.varName !== undefined && a.varName === p.varName && a.dims === p.dims ? 'yes' : 'maybe';
+            // Nothing but the variable itself is a subtype of it.
+            return a.prim || a.fqn ? 'no' : 'maybe';
+        }
+        if (p.typeVar) {
+            // Whatever fills a type variable is a subtype of its erasure, so an
+            // argument the erasure rules out is ruled out. One it admits is
+            // certainly admitted only where the compiler infers the variable from
+            // the arguments.
+            if (p.erasure) {
+                const f = this.fits(a, p.erasure, phase);
+                return f === 'no' ? 'no' : p.certain ? f : 'maybe';
+            }
             return a.prim && a.dims === 0 && phase === 1 ? 'no' : 'maybe';
+        }
         if (a.simple === 'null' && a.dims === 0)
             return p.prim && p.dims === 0 ? 'no' : 'yes';
-        if (a.typeVar)
+        if (a.typeVar) {
+            // A value of a type variable is a value of its erasure, and maybe of
+            // something narrower.
+            // A type variable's supertypes are its bound's; what a generic call
+            // infers is only known to be below the erasure.
+            if (a.erasure) {
+                // An unbounded variable's only supertype is Object.
+                if (!a.inferred && a.erasure.fqn === 'java.lang.Object' && a.erasure.dims === 0) {
+                    return !p.prim && p.dims === 0 && p.simple === 'Object' && (!p.fqn || p.fqn === 'java.lang.Object') ? 'yes' : 'no';
+                }
+                const f = this.fits(a.erasure, p, phase);
+                return a.inferred && f !== 'yes' ? 'maybe' : f;
+            }
             return 'maybe';
+        }
         if (a.dims > 0 || p.dims > 0) {
             if (a.dims === p.dims) {
                 const ae = { ...a, dims: 0 };
@@ -895,7 +1014,7 @@ export class NavigationIndex {
      */
     argumentType(arg, call, rec, depth) {
         if (arg.type)
-            return this.typeRef(arg.type, rec);
+            return this.callSiteRef(arg.type, call, rec);
         if (!arg.location || depth >= 4)
             return null;
         const name = outerCallName(arg.expression);
@@ -908,6 +1027,11 @@ export class NavigationIndex {
         let returned;
         let receiver;
         if (b?.kind === 'bound' && b.overload?.returnType) {
+            // `<M extends Map<K, V>> M invert(…)` returns whatever the call infers
+            // for `M`: known only to be some subtype of the erasure.
+            const own = this.paramRef(b.overload.returnType, { owner: b.owner, overload: b.overload });
+            if (own.varName && b.overload.typeParams.includes(own.varName))
+                return { ...own, inferred: true };
             returned = { text: b.overload.returnType, owner: b.owner };
             receiver = b.receiver;
         }
@@ -1068,37 +1192,165 @@ export class NavigationIndex {
     signatureMatches(o, params, owner) {
         if (o.params.length !== params.length)
             return false;
-        const rec = this.files.get(owner.file);
-        return o.params.every((p, i) => {
+        const have = this.paramRefs({ owner, overload: o });
+        return have.every((h, i) => {
             const want = this.typeRef(params[i], undefined);
-            const have = this.typeRef(p, rec);
-            if (want.dims !== have.dims)
+            if (want.dims !== h.dims)
                 return false;
             const wantBare = eraseType(params[i].replace(/\.\.\.$/, '').replace(/(\[\])+$/, ''));
-            if (wantBare.includes('.')) {
-                if (have.fqn && !have.prim)
-                    return have.fqn === wantBare;
-                return have.simple === want.simple;
-            }
-            return have.simple === want.simple;
+            // A type variable is named as written (`K`) or by its erasure (`Object`,
+            // `java.lang.Object`), the way the compiler and bytecode name it.
+            if (h.varName && wantBare === h.varName)
+                return true;
+            return this.sameAsWritten(h, want, wantBare);
         });
     }
-    /** Same name and same erased parameter types: one overrides the other. */
+    /** Whether a declared parameter type is the one a query wrote. */
+    sameAsWritten(have, want, wantBare) {
+        if (wantBare.includes('.') && have.fqn && !have.prim)
+            return have.fqn === wantBare;
+        return have.simple === want.simple;
+    }
+    /**
+     * Same name and same parameter types: one overrides the other, as the
+     * compiler decides it. Within one type that is the erasure, which the
+     * compiler requires to differ between two declarations. Between a type and
+     * its supertype, the supertype's parameter types are first read through the
+     * subtype's supertype clauses — `Fn<T>.apply(T)` is `apply(String)` to a
+     * class implementing `Fn<String>`, and `apply(T)` to one implementing
+     * `Fn<T>`, which then does not override it with `apply(Collection<T>)` —
+     * and the erasures compared. Between types neither of which is known to
+     * extend the other, a type variable still matches whatever its erasure
+     * admits.
+     */
     sameErasure(a, b) {
-        const pa = a.overload.params;
-        const pb = b.overload.params;
-        if (a.overload.name !== b.overload.name || pa.length !== pb.length)
+        if (a.overload.name !== b.overload.name || a.overload.params.length !== b.overload.params.length)
             return false;
-        const ra = this.files.get(a.owner.file);
-        const rb = this.files.get(b.owner.file);
-        return pa.every((p, i) => {
-            const x = this.typeRef(p, ra);
-            const y = this.typeRef(pb[i], rb);
-            if (x.typeVar || y.typeVar)
-                return x.dims === y.dims;
-            return x.simple === y.simple && x.dims === y.dims;
+        if (a.owner !== b.owner) {
+            const sub = this.isSubtype(a.owner.fqn, b.owner.fqn) ? a : this.isSubtype(b.owner.fqn, a.owner.fqn) ? b : undefined;
+            if (sub)
+                return this.overridesBySubstitution(sub, sub === a ? b : a);
+        }
+        const pa = this.paramRefs(a);
+        const pb = this.paramRefs(b);
+        const across = a.owner !== b.owner;
+        const open = (t, c) => across && t.typeVar && (!t.varName || !c.overload.typeParams.includes(t.varName));
+        return pa.every((x, i) => {
+            const y = pb[i];
+            if (x.dims !== y.dims)
+                return false;
+            const xo = open(x, a);
+            const yo = open(y, b);
+            if (xo && yo)
+                return true;
+            if (xo)
+                return !x.erasure || this.fits({ ...y, dims: 0 }, { ...x.erasure, dims: 0 }, 1) !== 'no';
+            if (yo)
+                return !y.erasure || this.fits({ ...x, dims: 0 }, { ...y.erasure, dims: 0 }, 1) !== 'no';
+            // A type variable no declaration in scope names: as lenient as before.
+            if ((x.typeVar && !x.erasure) || (y.typeVar && !y.erasure))
+                return true;
+            return x.simple === y.simple;
+        });
+    }
+    /** Whether `sub`'s declaration has `sup`'s parameter types as `sub`'s type sees them, erased. */
+    overridesBySubstitution(sub, sup) {
+        const mine = this.paramRefs(sub);
+        const scope = this.scopeOf(sub.owner, sub.overload);
+        return sup.overload.params.every((written, i) => {
+            const own = sup.overload.vars[i];
+            // The supertype method's own type variable: its erasure.
+            const s = own && sup.overload.typeParams.includes(own.name) ? undefined : this.substitute(written, sup.owner, sub.owner.fqn);
+            // No binding read for the variable (a raw supertype, or a clause this
+            // index cannot resolve): the supertype's own erasure.
+            const theirs = s
+                ? this.withErasure(s.text, eraseWritten(s.text, scope), s.rec)
+                : this.paramRef(written, sup);
+            const m = mine[i];
+            if (m.dims !== theirs.dims)
+                return false;
+            if (m.typeVar && !m.erasure)
+                return true;
+            if (theirs.typeVar && !theirs.erasure)
+                return true;
+            return m.simple === theirs.simple;
         });
     }
+    /** A candidate's parameter types, each type variable carrying its erasure. */
+    paramRefs(c) {
+        return c.overload.params.map(p => this.paramRef(p, c));
+    }
+    /**
+     * `c`'s parameter types as a call on `self` — the enclosing type, as an
+     * implicit, `this.` or `super.` receiver — sees them: a variable of the
+     * declaring type is that of `self` when `self` declares it, and what
+     * `self`'s supertype clauses fill it with when it is inherited
+     * (`Lru extends Base<String>` makes `Base<K>.put(K)` a `put(String)`).
+     */
+    paramRefsFrom(c, self) {
+        const refs = this.paramRefs(c);
+        if (!self)
+            return refs;
+        return refs.map((r, i) => {
+            if (!r.typeVar || !r.varName || c.overload.typeParams.includes(r.varName))
+                return r;
+            if (c.owner === self)
+                return { ...r, opaque: true };
+            const sub = this.substitute(c.overload.params[i], c.owner, self.fqn);
+            if (!sub)
+                return r;
+            const e = eraseWritten(sub.text, this.scopeOf(self, undefined));
+            if (e)
+                return { ...this.withErasure(sub.text, e, sub.rec), opaque: true };
+            return this.typeRef(sub.text, sub.rec);
+        });
+    }
+    /**
+     * An argument's written type at a call site: a type variable of the
+     * enclosing method or type carries its erasure.
+     */
+    callSiteRef(written, call, rec) {
+        const encl = this.enclosingTypeOf(call, rec);
+        if (!encl)
+            return this.typeRef(written, rec);
+        const line = call.location.line;
+        let method;
+        for (const list of encl.overloads.values()) {
+            for (const o of list) {
+                if (line < o.startLine || line > o.endLine)
+                    continue;
+                if (!method || o.endLine - o.startLine < method.endLine - method.startLine)
+                    method = o;
+            }
+        }
+        return this.withErasure(written, eraseWritten(written, this.scopeOf(encl, method)), rec);
+    }
+    /** One written parameter (or return) type of `c`, from its declaring file's point of view. */
+    paramRef(written, c) {
+        const i = c.overload.params.indexOf(written);
+        const e = i !== -1 && c.overload.vars[i]
+            ? { ...c.overload.vars[i], text: c.overload.erased[i] }
+            : eraseWritten(written, this.scopeOf(c.owner, c.overload));
+        return this.withErasure(written, e, this.files.get(c.owner.file));
+    }
+    /** A written type, with the erasure `eraseWritten` found for it when it is a type variable. */
+    withErasure(written, e, rec) {
+        if (!e)
+            return this.typeRef(written, rec);
+        const erased = this.typeRef(e.text, rec);
+        return { ...erased, typeVar: true, varName: e.name, erasure: erased, certain: e.certain };
+    }
+    /** The type variables visible in a member of `owner` (`overload`), innermost first. */
+    scopeOf(owner, overload) {
+        const types = [];
+        let t = owner;
+        while (t) {
+            types.push(t);
+            const outer = this.typesByFqn.get(stripLast(t.fqn));
+            t = outer && outer.file === owner.file ? outer : undefined;
+        }
+        return { method: overload ?? null, types };
+    }
     // --------------------------------------------------------------- dispatch
     /**
      * How a site bound to `owner.overload` reaches `target`'s overload, if it
@@ -1728,6 +1980,10 @@ function buildFileRecord(f) {
                 startLine: m.start_line,
                 endLine: m.end_line,
                 modifiers: m.modifiers ?? [],
+                typeParams: m.type_parameters ?? [],
+                typeBounds: m.type_parameter_bounds ?? {},
+                erased: params,
+                vars: params.map(() => null),
             });
         }
         types.push({
@@ -1742,6 +1998,7 @@ function buildFileRecord(f) {
             fieldNames: (t.fields ?? []).map(x => x.name),
             fieldTypes: new Map((t.fields ?? []).filter(x => x.type).map(x => [x.name, x.type])),
             typeParams: t.type_parameters ?? [],
+            typeBounds: t.type_parameter_bounds ?? {},
             getterFields: lombokFields(f.source, 'Getter'),
             setterFields: lombokFields(f.source, 'Setter'),
             methods,
@@ -1750,6 +2007,22 @@ function buildFileRecord(f) {
             endLine: t.end_line,
         });
     }
+    // Erase each parameter's type variables. Everything a declaration's
+    // variables can name — the method, its type, the types enclosing it — is in
+    // this file, so the result is per file and cached with it.
+    for (const t of types) {
+        const chain = [];
+        for (let c = t; c; c = types.find(x => x.fqn === stripLast(c.fqn)))
+            chain.push(c);
+        for (const list of t.overloads.values()) {
+            for (const o of list) {
+                const scope = { method: o, types: chain };
+                const es = o.params.map(p => eraseWritten(p, scope));
+                o.erased = o.params.map((p, i) => es[i]?.text ?? p);
+                o.vars = es.map(e => (e ? { name: e.name, certain: e.certain } : null));
+            }
+        }
+    }
     return {
         path: f.path,
         language: f.language,
@@ -1806,9 +2079,13 @@ function splitTopLevel(text) {
     out.push(buf);
     return out;
 }
-/** `(Long,String)` — simple names, generics erased, `String...` for varargs. */
+/**
+ * `(Long,String)` — simple names, generics erased, `String...` for varargs, a
+ * type variable shown as its erasure: `getNumber(Map,Object)` for
+ * `<K> getNumber(Map<? super K, ?>, K)`, as javadoc and bytecode name it.
+ */
 function signatureOf(o) {
-    return `(${o.params.map(p => {
+    return `(${o.erased.map(p => {
         const varargs = p.endsWith('...');
         let t = eraseType(p.replace(/@[\w.]+(\([^)]*\))?\s*/g, '').replace(/\bfinal\s+/g, '').replace(/\.\.\.$/, '').trim());
         let dims = '';
@@ -1823,6 +2100,51 @@ function signatureOf(o) {
 function memberName(owner, o) {
     return o.isConstructor ? `${owner.fqn}.<init>` : `${owner.fqn}.${o.name}`;
 }
+/**
+ * What a written type that is a type variable erases to, the way the compiler
+ * erases it: its leftmost bound, erased in turn when the bound is itself a
+ * variable (`W extends U`), else `Object`; array and varargs suffixes kept.
+ * Nothing when it is not a type variable in scope. The innermost declaration
+ * of a name hides the outer ones.
+ *
+ * `certain` says whether an argument that fits the erasure certainly fits the
+ * variable: so for a method's own variable, which the compiler infers from
+ * the arguments, unless its bound names the variable itself
+ * (`T extends Comparable<T>`); never for a type's, which the receiver fixes.
+ */
+function eraseWritten(written, scope, seen = new Set()) {
+    let t = written.replace(/@[\w.]+(\([^)]*\))?\s*/g, '').replace(/\bfinal\s+/g, '').trim();
+    let suffix = '';
+    if (t.endsWith('...')) {
+        suffix = '...';
+        t = t.slice(0, -3).trim();
+    }
+    t = eraseType(t);
+    while (t.endsWith('[]')) {
+        suffix = `[]${suffix}`;
+        t = t.slice(0, -2).trim();
+    }
+    if (!/^[A-Za-z_$][\w$]*$/.test(t) || seen.has(t))
+        return undefined;
+    let v;
+    if (scope.method?.typeParams.includes(t))
+        v = { bound: scope.method.typeBounds[t] ?? null, kind: 'method' };
+    else {
+        const owner = scope.types.find(x => x.typeParams.includes(t));
+        if (owner)
+            v = { bound: owner.typeBounds[t] ?? null, kind: 'type' };
+    }
+    if (!v)
+        return undefined;
+    if (v.bound === null)
+        return { name: t, text: `Object${suffix}`, certain: v.kind === 'method' };
+    const inner = eraseWritten(v.bound, scope, new Set([...seen, t]));
+    if (inner)
+        return { name: t, text: `${inner.text}${suffix}`, certain: v.kind === 'method' && inner.certain };
+    const args = v.bound.includes('<') ? v.bound.slice(v.bound.indexOf('<') + 1) : '';
+    const selfBounded = new RegExp(`\\b${t}\\b`).test(args);
+    return { name: t, text: `${eraseType(v.bound)}${suffix}`, certain: v.kind === 'method' && !selfBounded };
+}
 /** Remove every `<...>` from a written type. */
 function eraseType(t) {
     let out = '';
@@ -1841,6 +2163,11 @@ function eraseType(t) {
     }
     return out.trim();
 }
+/** A varargs parameter's element type. */
+function elementOf(t) {
+    const dims = Math.max(0, t.dims - 1);
+    return { ...t, dims, ...(t.erasure ? { erasure: { ...t.erasure, dims } } : {}) };
+}
 /** Whether a call with `n` arguments can reach overload `o` at all. */
 function fitsArity(o, n) {
     if (o.params.length === n)