mirror of
https://github.com/github/codeql.git
synced 2026-07-15 00:08:14 +02:00
240103e7b3
The K1 and K2 frontends record different source locations for the
compiler-synthesised primary constructor of a class that declares no primary
constructor in source. K2 uses the class declaration's raw IR offsets, which
include any leading modifier keywords, while K1's raw offsets start at the
`class` keyword and omit the modifiers.
Since K1 (unlike K2) retains the PSI, we recover the modifier-inclusive span
from the enclosing KtClassOrObject so K1 matches the K2-native span.
Example, for `open class C0<V> {}` on line 11 (the `open` modifier is at
column 1, the `class` keyword at column 6):
before (K1): generics.kt:11:6:11:19 | C0 | C0()
after (K1): generics.kt:11:1:11:19 | C0 | C0() (matches K2)
The fix is deliberately narrow and leaves all other constructors untouched:
- explicit primary constructors (`class C1(val t: T)`, `class C2()`) keep
their own parameter-list location, which both frontends already agree on;
- explicit secondary constructors keep their own location (only the
`isPrimary` constructor is adjusted);
- specialised/parameterised copies of a generic constructor
(`typeSubstitution != null`) are excluded, so they do not gain a spurious
source location and appear in source-filtered queries.
Relearned test-kotlin1 (K1) and test-kotlin2 (K2): all 3333 tests pass with
database-consistency checks. Only test-kotlin1 expected files change (K2 output
is unchanged, as K2 already emits these spans natively). No previously matching
row diverges; net K1-vs-K2 divergence decreases on every affected file, with
generics, generic-inner-classes and modifiers now fully identical.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
88 lines
4.7 KiB
Plaintext
88 lines
4.7 KiB
Plaintext
| modifiers.kt:1:1:29:1 | X | Class | public |
|
|
| modifiers.kt:1:1:29:1 | X | Constructor | public |
|
|
| modifiers.kt:2:13:2:17 | getA$private | Method | final |
|
|
| modifiers.kt:2:13:2:17 | getA$private | Method | private |
|
|
| modifiers.kt:2:13:2:21 | a | Field | final |
|
|
| modifiers.kt:2:13:2:21 | a | Field | private |
|
|
| modifiers.kt:2:13:2:21 | a | Property | private |
|
|
| modifiers.kt:3:15:3:19 | getB | Method | final |
|
|
| modifiers.kt:3:15:3:19 | getB | Method | protected |
|
|
| modifiers.kt:3:15:3:23 | b | Field | final |
|
|
| modifiers.kt:3:15:3:23 | b | Field | private |
|
|
| modifiers.kt:3:15:3:23 | b | Property | protected |
|
|
| modifiers.kt:4:14:4:18 | getC$main | Method | final |
|
|
| modifiers.kt:4:14:4:18 | getC$main | Method | internal |
|
|
| modifiers.kt:4:14:4:22 | c | Field | final |
|
|
| modifiers.kt:4:14:4:22 | c | Field | private |
|
|
| modifiers.kt:4:14:4:22 | c | Property | internal |
|
|
| modifiers.kt:5:5:5:9 | getD | Method | final |
|
|
| modifiers.kt:5:5:5:9 | getD | Method | public |
|
|
| modifiers.kt:5:5:5:34 | d | Field | final |
|
|
| modifiers.kt:5:5:5:34 | d | Field | private |
|
|
| modifiers.kt:5:5:5:34 | d | Property | public |
|
|
| modifiers.kt:7:5:9:5 | Nested | Class | final |
|
|
| modifiers.kt:7:5:9:5 | Nested | Class | protected |
|
|
| modifiers.kt:7:5:9:5 | Nested | Constructor | public |
|
|
| modifiers.kt:8:16:8:25 | getE | Method | final |
|
|
| modifiers.kt:8:16:8:25 | getE | Method | public |
|
|
| modifiers.kt:8:16:8:29 | e | Field | final |
|
|
| modifiers.kt:8:16:8:29 | e | Field | private |
|
|
| modifiers.kt:8:16:8:29 | e | Property | public |
|
|
| modifiers.kt:11:5:15:5 | fn1 | Method | final |
|
|
| modifiers.kt:11:5:15:5 | fn1 | Method | public |
|
|
| modifiers.kt:12:16:14:9 | | Constructor | public |
|
|
| modifiers.kt:12:16:14:9 | new Object(...) { ... } | AnonymousClass | final |
|
|
| modifiers.kt:12:16:14:9 | new Object(...) { ... } | AnonymousClass | private |
|
|
| modifiers.kt:12:16:14:9 | new Object(...) { ... } | LocalClass | final |
|
|
| modifiers.kt:12:16:14:9 | new Object(...) { ... } | LocalClass | private |
|
|
| modifiers.kt:13:13:13:23 | fn | Method | final |
|
|
| modifiers.kt:13:13:13:23 | fn | Method | public |
|
|
| modifiers.kt:17:5:20:5 | fn2 | Method | final |
|
|
| modifiers.kt:17:5:20:5 | fn2 | Method | public |
|
|
| modifiers.kt:18:9:18:24 | | Constructor | public |
|
|
| modifiers.kt:18:9:18:24 | | LocalClass | final |
|
|
| modifiers.kt:18:9:18:24 | | LocalClass | private |
|
|
| modifiers.kt:18:9:18:24 | fnLocal | Method | final |
|
|
| modifiers.kt:18:9:18:24 | fnLocal | Method | public |
|
|
| modifiers.kt:22:5:24:5 | fn3 | Method | final |
|
|
| modifiers.kt:22:5:24:5 | fn3 | Method | public |
|
|
| modifiers.kt:23:9:23:27 | localClass | Constructor | public |
|
|
| modifiers.kt:23:9:23:27 | localClass | LocalClass | final |
|
|
| modifiers.kt:23:9:23:27 | localClass | LocalClass | private |
|
|
| modifiers.kt:26:12:26:46 | fn4 | Method | final |
|
|
| modifiers.kt:26:12:26:46 | fn4 | Method | inline |
|
|
| modifiers.kt:26:12:26:46 | fn4 | Method | public |
|
|
| modifiers.kt:26:20:26:41 | f | Parameter | noinline |
|
|
| modifiers.kt:27:12:27:49 | fn5 | Method | final |
|
|
| modifiers.kt:27:12:27:49 | fn5 | Method | inline |
|
|
| modifiers.kt:27:12:27:49 | fn5 | Method | public |
|
|
| modifiers.kt:27:20:27:44 | f | Parameter | crossinline |
|
|
| modifiers.kt:28:12:28:39 | fn6 | Method | final |
|
|
| modifiers.kt:28:12:28:39 | fn6 | Method | inline |
|
|
| modifiers.kt:28:12:28:39 | fn6 | Method | public |
|
|
| modifiers.kt:28:17:28:25 | T | TypeVariable | reified |
|
|
| modifiers.kt:31:1:33:1 | Y | Class | final |
|
|
| modifiers.kt:31:1:33:1 | Y | Class | public |
|
|
| modifiers.kt:31:1:33:1 | Y | Constructor | public |
|
|
| modifiers.kt:31:1:33:1 | Y | GenericType | final |
|
|
| modifiers.kt:31:1:33:1 | Y | GenericType | public |
|
|
| modifiers.kt:31:1:33:1 | Y | ParameterizedType | final |
|
|
| modifiers.kt:31:1:33:1 | Y | ParameterizedType | public |
|
|
| modifiers.kt:31:9:31:13 | T1 | TypeVariable | in |
|
|
| modifiers.kt:31:16:31:21 | T2 | TypeVariable | out |
|
|
| modifiers.kt:32:5:32:32 | foo | Method | final |
|
|
| modifiers.kt:32:5:32:32 | foo | Method | public |
|
|
| modifiers.kt:35:1:41:1 | LateInit | Class | final |
|
|
| modifiers.kt:35:1:41:1 | LateInit | Class | public |
|
|
| modifiers.kt:35:1:41:1 | LateInit | Constructor | public |
|
|
| modifiers.kt:36:22:36:40 | getTest0$private | Method | final |
|
|
| modifiers.kt:36:22:36:40 | getTest0$private | Method | private |
|
|
| modifiers.kt:36:22:36:40 | setTest0$private | Method | final |
|
|
| modifiers.kt:36:22:36:40 | setTest0$private | Method | private |
|
|
| modifiers.kt:36:22:36:40 | test0 | Field | private |
|
|
| modifiers.kt:36:22:36:40 | test0 | Property | lateinit |
|
|
| modifiers.kt:36:22:36:40 | test0 | Property | private |
|
|
| modifiers.kt:38:5:40:5 | fn | Method | final |
|
|
| modifiers.kt:38:5:40:5 | fn | Method | public |
|
|
| modifiers.kt:39:18:39:36 | LateInit test1 | LocalVariableDecl | lateinit |
|