From 564364b0511b49012e01dc694037f6f594e079b7 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Tue, 19 Aug 2025 09:44:50 +0200
Subject: [PATCH 1/6] Java: accept new test results after extractor update

---
 .../test.expected                             | 120 ++++++------------
 .../reflection/reflection.expected            |   1 +
 .../test.expected                             | 117 ++++++-----------
 .../reflection/reflection.expected            |   1 +
 4 files changed, 77 insertions(+), 162 deletions(-)

diff --git a/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected b/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected
index b901340b9642..a56980d10ac4 100644
--- a/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected
+++ b/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -16,30 +16,6 @@ methodWithDuplicate
 | AbstractCollection<E> | removeAll | Collection<?> |
 | AbstractCollection<E> | retainAll | Collection<?> |
 | AbstractCollection<E> | toArray | T[] |
-| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
-| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
-| AbstractCollection<Entry<K,V>> | contains | Object |
-| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | remove | Object |
-| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | toArray | T[] |
-| AbstractCollection<K> | add | K |
-| AbstractCollection<K> | addAll | Collection<? extends K> |
-| AbstractCollection<K> | contains | Object |
-| AbstractCollection<K> | containsAll | Collection<?> |
-| AbstractCollection<K> | remove | Object |
-| AbstractCollection<K> | removeAll | Collection<?> |
-| AbstractCollection<K> | retainAll | Collection<?> |
-| AbstractCollection<K> | toArray | T[] |
-| AbstractCollection<Runnable> | add | Runnable |
-| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
-| AbstractCollection<Runnable> | contains | Object |
-| AbstractCollection<Runnable> | containsAll | Collection<?> |
-| AbstractCollection<Runnable> | remove | Object |
-| AbstractCollection<Runnable> | removeAll | Collection<?> |
-| AbstractCollection<Runnable> | retainAll | Collection<?> |
-| AbstractCollection<Runnable> | toArray | T[] |
 | AbstractCollection<String> | add | String |
 | AbstractCollection<String> | addAll | Collection<? extends String> |
 | AbstractCollection<String> | contains | Object |
@@ -56,14 +32,6 @@ methodWithDuplicate
 | AbstractCollection<T> | removeAll | Collection<?> |
 | AbstractCollection<T> | retainAll | Collection<?> |
 | AbstractCollection<T> | toArray | T[] |
-| AbstractCollection<V> | add | V |
-| AbstractCollection<V> | addAll | Collection<? extends V> |
-| AbstractCollection<V> | contains | Object |
-| AbstractCollection<V> | containsAll | Collection<?> |
-| AbstractCollection<V> | remove | Object |
-| AbstractCollection<V> | removeAll | Collection<?> |
-| AbstractCollection<V> | retainAll | Collection<?> |
-| AbstractCollection<V> | toArray | T[] |
 | AbstractList | add | E |
 | AbstractList | add | int |
 | AbstractList | addAll | Collection<? extends E> |
@@ -103,14 +71,14 @@ methodWithDuplicate
 | AbstractMap | put | V |
 | AbstractMap | putAll | Map<? extends K,? extends V> |
 | AbstractMap | remove | Object |
-| AbstractMap<Identity,Entry<?>> | containsKey | Object |
-| AbstractMap<Identity,Entry<?>> | containsValue | Object |
-| AbstractMap<Identity,Entry<?>> | equals | Object |
-| AbstractMap<Identity,Entry<?>> | get | Object |
-| AbstractMap<Identity,Entry<?>> | put | Entry<?> |
-| AbstractMap<Identity,Entry<?>> | put | Identity |
-| AbstractMap<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
-| AbstractMap<Identity,Entry<?>> | remove | Object |
+| AbstractMap<Identity,Object> | containsKey | Object |
+| AbstractMap<Identity,Object> | containsValue | Object |
+| AbstractMap<Identity,Object> | equals | Object |
+| AbstractMap<Identity,Object> | get | Object |
+| AbstractMap<Identity,Object> | put | Identity |
+| AbstractMap<Identity,Object> | put | Object |
+| AbstractMap<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
+| AbstractMap<Identity,Object> | remove | Object |
 | AbstractMap<K,V> | containsKey | Object |
 | AbstractMap<K,V> | containsValue | Object |
 | AbstractMap<K,V> | equals | Object |
@@ -179,17 +147,6 @@ methodWithDuplicate
 | Collection<K> | retainAll | Collection<?> |
 | Collection<K> | toArray | IntFunction<T[]> |
 | Collection<K> | toArray | T[] |
-| Collection<Runnable> | add | Runnable |
-| Collection<Runnable> | addAll | Collection<? extends Runnable> |
-| Collection<Runnable> | contains | Object |
-| Collection<Runnable> | containsAll | Collection<?> |
-| Collection<Runnable> | equals | Object |
-| Collection<Runnable> | remove | Object |
-| Collection<Runnable> | removeAll | Collection<?> |
-| Collection<Runnable> | removeIf | Predicate<? super Runnable> |
-| Collection<Runnable> | retainAll | Collection<?> |
-| Collection<Runnable> | toArray | IntFunction<T[]> |
-| Collection<Runnable> | toArray | T[] |
 | Collection<String> | add | String |
 | Collection<String> | addAll | Collection<? extends String> |
 | Collection<String> | contains | Object |
@@ -332,37 +289,36 @@ methodWithDuplicate
 | Map | replace | K |
 | Map | replace | V |
 | Map | replaceAll | BiFunction<? super K,? super V,? extends V> |
-| Map<Identity,Entry<?>> | compute | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | compute | Identity |
-| Map<Identity,Entry<?>> | computeIfAbsent | Function<? super Identity,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | computeIfAbsent | Identity |
-| Map<Identity,Entry<?>> | computeIfPresent | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | computeIfPresent | Identity |
-| Map<Identity,Entry<?>> | containsKey | Object |
-| Map<Identity,Entry<?>> | containsValue | Object |
-| Map<Identity,Entry<?>> | copyOf | Map<? extends K,? extends V> |
-| Map<Identity,Entry<?>> | entry | K |
-| Map<Identity,Entry<?>> | entry | V |
-| Map<Identity,Entry<?>> | equals | Object |
-| Map<Identity,Entry<?>> | forEach | BiConsumer<? super Identity,? super Entry<?>> |
-| Map<Identity,Entry<?>> | get | Object |
-| Map<Identity,Entry<?>> | getOrDefault | Entry<?> |
-| Map<Identity,Entry<?>> | getOrDefault | Object |
-| Map<Identity,Entry<?>> | merge | BiFunction<? super Entry<?>,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | merge | Entry<?> |
-| Map<Identity,Entry<?>> | merge | Identity |
-| Map<Identity,Entry<?>> | of | K |
-| Map<Identity,Entry<?>> | of | V |
-| Map<Identity,Entry<?>> | ofEntries | Entry<? extends K,? extends V>[] |
-| Map<Identity,Entry<?>> | put | Entry<?> |
-| Map<Identity,Entry<?>> | put | Identity |
-| Map<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | putIfAbsent | Entry<?> |
-| Map<Identity,Entry<?>> | putIfAbsent | Identity |
-| Map<Identity,Entry<?>> | remove | Object |
-| Map<Identity,Entry<?>> | replace | Entry<?> |
-| Map<Identity,Entry<?>> | replace | Identity |
-| Map<Identity,Entry<?>> | replaceAll | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
+| Map<Identity,Object> | compute | BiFunction<? super Identity,? super Object,? extends Object> |
+| Map<Identity,Object> | compute | Identity |
+| Map<Identity,Object> | computeIfAbsent | Function<? super Identity,? extends Object> |
+| Map<Identity,Object> | computeIfAbsent | Identity |
+| Map<Identity,Object> | computeIfPresent | BiFunction<? super Identity,? super Object,? extends Object> |
+| Map<Identity,Object> | computeIfPresent | Identity |
+| Map<Identity,Object> | containsKey | Object |
+| Map<Identity,Object> | containsValue | Object |
+| Map<Identity,Object> | copyOf | Map<? extends K,? extends V> |
+| Map<Identity,Object> | entry | K |
+| Map<Identity,Object> | entry | V |
+| Map<Identity,Object> | equals | Object |
+| Map<Identity,Object> | forEach | BiConsumer<? super Identity,? super Object> |
+| Map<Identity,Object> | get | Object |
+| Map<Identity,Object> | getOrDefault | Object |
+| Map<Identity,Object> | merge | BiFunction<? super Object,? super Object,? extends Object> |
+| Map<Identity,Object> | merge | Identity |
+| Map<Identity,Object> | merge | Object |
+| Map<Identity,Object> | of | K |
+| Map<Identity,Object> | of | V |
+| Map<Identity,Object> | ofEntries | Entry<? extends K,? extends V>[] |
+| Map<Identity,Object> | put | Identity |
+| Map<Identity,Object> | put | Object |
+| Map<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
+| Map<Identity,Object> | putIfAbsent | Identity |
+| Map<Identity,Object> | putIfAbsent | Object |
+| Map<Identity,Object> | remove | Object |
+| Map<Identity,Object> | replace | Identity |
+| Map<Identity,Object> | replace | Object |
+| Map<Identity,Object> | replaceAll | BiFunction<? super Identity,? super Object,? extends Object> |
 | Map<K,V> | compute | BiFunction<? super K,? super V,? extends V> |
 | Map<K,V> | compute | K |
 | Map<K,V> | computeIfAbsent | Function<? super K,? extends V> |
diff --git a/java/ql/test-kotlin1/library-tests/reflection/reflection.expected b/java/ql/test-kotlin1/library-tests/reflection/reflection.expected
index 7ce456cdcbb2..3bc2f9ce67d6 100644
--- a/java/ql/test-kotlin1/library-tests/reflection/reflection.expected
+++ b/java/ql/test-kotlin1/library-tests/reflection/reflection.expected
@@ -289,6 +289,7 @@ compGenerated
 | file://<external>/LongProgression.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/LongRange.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/LongRange.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
+| file://<external>/String.class:0:0:0:0 | getChars | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/String.class:0:0:0:0 | isEmpty | Forwarder for a Kotlin class inheriting an interface default method |
 | reflection.kt:7:49:7:54 | new Function2<Ccc,Integer,Double>(...) { ... } | The class around a local function, a lambda, or a function reference |
 | reflection.kt:10:38:10:42 | new KProperty1<C,Integer>(...) { ... } | The class around a local function, a lambda, or a function reference |
diff --git a/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected b/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
index 03e86e2d2a18..2495c1fc1572 100644
--- a/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
+++ b/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -16,30 +16,6 @@ methodWithDuplicate
 | AbstractCollection<E> | removeAll | Collection<?> |
 | AbstractCollection<E> | retainAll | Collection<?> |
 | AbstractCollection<E> | toArray | T[] |
-| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
-| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
-| AbstractCollection<Entry<K,V>> | contains | Object |
-| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | remove | Object |
-| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | toArray | T[] |
-| AbstractCollection<K> | add | K |
-| AbstractCollection<K> | addAll | Collection<? extends K> |
-| AbstractCollection<K> | contains | Object |
-| AbstractCollection<K> | containsAll | Collection<?> |
-| AbstractCollection<K> | remove | Object |
-| AbstractCollection<K> | removeAll | Collection<?> |
-| AbstractCollection<K> | retainAll | Collection<?> |
-| AbstractCollection<K> | toArray | T[] |
-| AbstractCollection<Runnable> | add | Runnable |
-| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
-| AbstractCollection<Runnable> | contains | Object |
-| AbstractCollection<Runnable> | containsAll | Collection<?> |
-| AbstractCollection<Runnable> | remove | Object |
-| AbstractCollection<Runnable> | removeAll | Collection<?> |
-| AbstractCollection<Runnable> | retainAll | Collection<?> |
-| AbstractCollection<Runnable> | toArray | T[] |
 | AbstractCollection<String> | add | String |
 | AbstractCollection<String> | addAll | Collection<? extends String> |
 | AbstractCollection<String> | contains | Object |
@@ -56,14 +32,6 @@ methodWithDuplicate
 | AbstractCollection<T> | removeAll | Collection<?> |
 | AbstractCollection<T> | retainAll | Collection<?> |
 | AbstractCollection<T> | toArray | T[] |
-| AbstractCollection<V> | add | V |
-| AbstractCollection<V> | addAll | Collection<? extends V> |
-| AbstractCollection<V> | contains | Object |
-| AbstractCollection<V> | containsAll | Collection<?> |
-| AbstractCollection<V> | remove | Object |
-| AbstractCollection<V> | removeAll | Collection<?> |
-| AbstractCollection<V> | retainAll | Collection<?> |
-| AbstractCollection<V> | toArray | T[] |
 | AbstractList | add | E |
 | AbstractList | add | int |
 | AbstractList | addAll | Collection<? extends E> |
@@ -103,14 +71,14 @@ methodWithDuplicate
 | AbstractMap | put | V |
 | AbstractMap | putAll | Map<? extends K,? extends V> |
 | AbstractMap | remove | Object |
-| AbstractMap<Identity,Entry<?>> | containsKey | Object |
-| AbstractMap<Identity,Entry<?>> | containsValue | Object |
-| AbstractMap<Identity,Entry<?>> | equals | Object |
-| AbstractMap<Identity,Entry<?>> | get | Object |
-| AbstractMap<Identity,Entry<?>> | put | Entry<?> |
-| AbstractMap<Identity,Entry<?>> | put | Identity |
-| AbstractMap<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
-| AbstractMap<Identity,Entry<?>> | remove | Object |
+| AbstractMap<Identity,Object> | containsKey | Object |
+| AbstractMap<Identity,Object> | containsValue | Object |
+| AbstractMap<Identity,Object> | equals | Object |
+| AbstractMap<Identity,Object> | get | Object |
+| AbstractMap<Identity,Object> | put | Identity |
+| AbstractMap<Identity,Object> | put | Object |
+| AbstractMap<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
+| AbstractMap<Identity,Object> | remove | Object |
 | AbstractMap<K,V> | containsKey | Object |
 | AbstractMap<K,V> | containsValue | Object |
 | AbstractMap<K,V> | equals | Object |
@@ -176,16 +144,6 @@ methodWithDuplicate
 | Collection<K> | retainAll | Collection<?> |
 | Collection<K> | toArray | IntFunction<T[]> |
 | Collection<K> | toArray | T[] |
-| Collection<Runnable> | add | Runnable |
-| Collection<Runnable> | addAll | Collection<? extends Runnable> |
-| Collection<Runnable> | contains | Object |
-| Collection<Runnable> | containsAll | Collection<?> |
-| Collection<Runnable> | remove | Object |
-| Collection<Runnable> | removeAll | Collection<?> |
-| Collection<Runnable> | removeIf | Predicate<? super Runnable> |
-| Collection<Runnable> | retainAll | Collection<?> |
-| Collection<Runnable> | toArray | IntFunction<T[]> |
-| Collection<Runnable> | toArray | T[] |
 | Collection<String> | add | String |
 | Collection<String> | addAll | Collection<? extends String> |
 | Collection<String> | contains | Object |
@@ -325,36 +283,35 @@ methodWithDuplicate
 | Map | replace | K |
 | Map | replace | V |
 | Map | replaceAll | BiFunction<? super K,? super V,? extends V> |
-| Map<Identity,Entry<?>> | compute | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | compute | Identity |
-| Map<Identity,Entry<?>> | computeIfAbsent | Function<? super Identity,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | computeIfAbsent | Identity |
-| Map<Identity,Entry<?>> | computeIfPresent | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | computeIfPresent | Identity |
-| Map<Identity,Entry<?>> | containsKey | Object |
-| Map<Identity,Entry<?>> | containsValue | Object |
-| Map<Identity,Entry<?>> | copyOf | Map<? extends K,? extends V> |
-| Map<Identity,Entry<?>> | entry | K |
-| Map<Identity,Entry<?>> | entry | V |
-| Map<Identity,Entry<?>> | forEach | BiConsumer<? super Identity,? super Entry<?>> |
-| Map<Identity,Entry<?>> | get | Object |
-| Map<Identity,Entry<?>> | getOrDefault | Entry<?> |
-| Map<Identity,Entry<?>> | getOrDefault | Object |
-| Map<Identity,Entry<?>> | merge | BiFunction<? super Entry<?>,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | merge | Entry<?> |
-| Map<Identity,Entry<?>> | merge | Identity |
-| Map<Identity,Entry<?>> | of | K |
-| Map<Identity,Entry<?>> | of | V |
-| Map<Identity,Entry<?>> | ofEntries | Entry<? extends K,? extends V>[] |
-| Map<Identity,Entry<?>> | put | Entry<?> |
-| Map<Identity,Entry<?>> | put | Identity |
-| Map<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | putIfAbsent | Entry<?> |
-| Map<Identity,Entry<?>> | putIfAbsent | Identity |
-| Map<Identity,Entry<?>> | remove | Object |
-| Map<Identity,Entry<?>> | replace | Entry<?> |
-| Map<Identity,Entry<?>> | replace | Identity |
-| Map<Identity,Entry<?>> | replaceAll | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
+| Map<Identity,Object> | compute | BiFunction<? super Identity,? super Object,? extends Object> |
+| Map<Identity,Object> | compute | Identity |
+| Map<Identity,Object> | computeIfAbsent | Function<? super Identity,? extends Object> |
+| Map<Identity,Object> | computeIfAbsent | Identity |
+| Map<Identity,Object> | computeIfPresent | BiFunction<? super Identity,? super Object,? extends Object> |
+| Map<Identity,Object> | computeIfPresent | Identity |
+| Map<Identity,Object> | containsKey | Object |
+| Map<Identity,Object> | containsValue | Object |
+| Map<Identity,Object> | copyOf | Map<? extends K,? extends V> |
+| Map<Identity,Object> | entry | K |
+| Map<Identity,Object> | entry | V |
+| Map<Identity,Object> | forEach | BiConsumer<? super Identity,? super Object> |
+| Map<Identity,Object> | get | Object |
+| Map<Identity,Object> | getOrDefault | Object |
+| Map<Identity,Object> | merge | BiFunction<? super Object,? super Object,? extends Object> |
+| Map<Identity,Object> | merge | Identity |
+| Map<Identity,Object> | merge | Object |
+| Map<Identity,Object> | of | K |
+| Map<Identity,Object> | of | V |
+| Map<Identity,Object> | ofEntries | Entry<? extends K,? extends V>[] |
+| Map<Identity,Object> | put | Identity |
+| Map<Identity,Object> | put | Object |
+| Map<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
+| Map<Identity,Object> | putIfAbsent | Identity |
+| Map<Identity,Object> | putIfAbsent | Object |
+| Map<Identity,Object> | remove | Object |
+| Map<Identity,Object> | replace | Identity |
+| Map<Identity,Object> | replace | Object |
+| Map<Identity,Object> | replaceAll | BiFunction<? super Identity,? super Object,? extends Object> |
 | Map<K,V> | compute | BiFunction<? super K,? super V,? extends V> |
 | Map<K,V> | compute | K |
 | Map<K,V> | computeIfAbsent | Function<? super K,? extends V> |
diff --git a/java/ql/test-kotlin2/library-tests/reflection/reflection.expected b/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
index 4074866da65f..b5de2b1adea3 100644
--- a/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
+++ b/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
@@ -329,6 +329,7 @@ compGenerated
 | file://<external>/SignStyle.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/StackWalker$ExtendedOption.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/StackWalker$Option.class:0:0:0:0 | getEntries | Default property accessor |
+| file://<external>/String.class:0:0:0:0 | getChars | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/String.class:0:0:0:0 | isEmpty | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/TextStyle.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/Thread$State.class:0:0:0:0 | getEntries | Default property accessor |

From 44217f23d91e1c6f138e96c72cb84d37ccf8aa13 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Tue, 29 Jul 2025 14:51:10 +0200
Subject: [PATCH 2/6] Java: Add test for flexible constructor support

---
 .../CONSISTENCY/diags.expected                |  2 +
 .../FlexibleConstructors.java                 | 43 +++++++++
 .../flexible-constructors/PrintAst.expected   | 91 +++++++++++++++++++
 .../flexible-constructors/PrintAst.qlref      |  1 +
 .../flexible-constructors/options             |  2 +
 5 files changed, 139 insertions(+)
 create mode 100644 java/ql/test/library-tests/flexible-constructors/CONSISTENCY/diags.expected
 create mode 100644 java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
 create mode 100644 java/ql/test/library-tests/flexible-constructors/PrintAst.expected
 create mode 100644 java/ql/test/library-tests/flexible-constructors/PrintAst.qlref
 create mode 100644 java/ql/test/library-tests/flexible-constructors/options

diff --git a/java/ql/test/library-tests/flexible-constructors/CONSISTENCY/diags.expected b/java/ql/test/library-tests/flexible-constructors/CONSISTENCY/diags.expected
new file mode 100644
index 000000000000..14bea2604819
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/CONSISTENCY/diags.expected
@@ -0,0 +1,2 @@
+unexpectedDiagnostic
+| <compilation flexible-constructors.testproj/trap/java/diagnostics/diagnostic.trap.gz> | -1 | 0 | file://:0:0:0:0 | Unknown location for jdk.internal.RequiresIdentity+Annotation | Unknown location for jdk.internal.RequiresIdentity+Annotation |
diff --git a/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java b/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
new file mode 100644
index 000000000000..4c91e03faf95
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
@@ -0,0 +1,43 @@
+class A {
+    A(String msg) {
+        System.out.println("A: " + msg);
+    }
+}
+
+class B extends A {
+    B(String input) {
+        var msg = input.trim().toUpperCase();
+        super(msg);
+    }
+}
+
+class C {
+    private final int x;
+
+    C(int x) {
+        if (x < 0) throw new IllegalArgumentException();
+        super();
+        this.x = x;
+    }
+}
+
+record R(String name, int score) {
+    public R(String name) {
+        var score = name.length();
+        this(name, score);
+    }
+}
+
+class Outer {
+    private final String prefix = "outer";
+
+    class Inner {
+        private final String full;
+
+        Inner(String suffix) {
+            var combined = prefix + "_" + suffix;
+            super();
+            this.full = combined;
+        }
+    }
+}
diff --git a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
new file mode 100644
index 000000000000..f4508bc0b87c
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
@@ -0,0 +1,91 @@
+FlexibleConstructors.java:
+#    0| [CompilationUnit] FlexibleConstructors
+#    1|   1: [Class] A
+#    2|     1: [Constructor] A
+#-----|       4: (Parameters)
+#    2|         0: [Parameter] msg
+#    2|           0: [TypeAccess] String
+#    2|       5: [BlockStmt] { ... }
+#    3|         1: [ExprStmt] <Expr>;
+#    3|           0: [MethodCall] println(...)
+#    3|             -1: [VarAccess] System.out
+#    3|               -1: [TypeAccess] System
+#    3|             0: [AddExpr] ... + ...
+#    3|               0: [StringLiteral] "A: "
+#    3|               1: [VarAccess] msg
+#    7|   2: [Class] B
+#-----|     -1: (Base Types)
+#    7|       -1: [TypeAccess] A
+#    8|     1: [Constructor] B
+#-----|       4: (Parameters)
+#    8|         0: [Parameter] input
+#    8|           0: [TypeAccess] String
+#    8|       5: [BlockStmt] { ... }
+#    9|         0: [LocalVariableDeclStmt] var ...;
+#    9|           1: [LocalVariableDeclExpr] msg
+#    9|             0: [MethodCall] toUpperCase(...)
+#    9|               -1: [MethodCall] trim(...)
+#    9|                 -1: [VarAccess] input
+#   10|         1: [SuperConstructorInvocationStmt] super(...)
+#   10|           0: [VarAccess] msg
+#   14|   3: [Class] C
+#   15|     1: [FieldDeclaration] int x;
+#   15|       -1: [TypeAccess] int
+#   17|     2: [Constructor] C
+#-----|       4: (Parameters)
+#   17|         0: [Parameter] x
+#   17|           0: [TypeAccess] int
+#   17|       5: [BlockStmt] { ... }
+#   18|         0: [IfStmt] if (...)
+#   18|           0: [LTExpr] ... < ...
+#   18|             0: [VarAccess] x
+#   18|             1: [IntegerLiteral] 0
+#   18|           1: [ThrowStmt] throw ...
+#   18|             0: [ClassInstanceExpr] new IllegalArgumentException(...)
+#   18|               -3: [TypeAccess] IllegalArgumentException
+#   19|         1: [SuperConstructorInvocationStmt] super(...)
+#   20|         2: [ExprStmt] <Expr>;
+#   20|           0: [AssignExpr] ...=...
+#   20|             0: [VarAccess] this.x
+#   20|               -1: [ThisAccess] this
+#   20|             1: [VarAccess] x
+#   24|   4: [Class] R
+#   24|     2: [FieldDeclaration] String name;
+#   24|     3: [FieldDeclaration] int score;
+#   25|     4: [Constructor] R
+#-----|       4: (Parameters)
+#   25|         0: [Parameter] name
+#   25|           0: [TypeAccess] String
+#   25|       5: [BlockStmt] { ... }
+#   26|         0: [LocalVariableDeclStmt] var ...;
+#   26|           1: [LocalVariableDeclExpr] score
+#   26|             0: [MethodCall] length(...)
+#   26|               -1: [VarAccess] name
+#   27|         1: [ThisConstructorInvocationStmt] this(...)
+#   27|           0: [VarAccess] name
+#   27|           1: [VarAccess] score
+#   31|   5: [Class] Outer
+#   32|     3: [FieldDeclaration] String prefix;
+#   32|       -1: [TypeAccess] String
+#   32|       0: [StringLiteral] "outer"
+#   34|     4: [Class] Inner
+#   35|       1: [FieldDeclaration] String full;
+#   35|         -1: [TypeAccess] String
+#   37|       2: [Constructor] Inner
+#-----|         4: (Parameters)
+#   37|           0: [Parameter] suffix
+#   37|             0: [TypeAccess] String
+#   37|         5: [BlockStmt] { ... }
+#   38|           0: [LocalVariableDeclStmt] var ...;
+#   38|             1: [LocalVariableDeclExpr] combined
+#   38|               0: [AddExpr] ... + ...
+#   38|                 0: [AddExpr] ... + ...
+#   38|                   0: [VarAccess] prefix
+#   38|                   1: [StringLiteral] "_"
+#   38|                 1: [VarAccess] suffix
+#   39|           1: [SuperConstructorInvocationStmt] super(...)
+#   40|           2: [ExprStmt] <Expr>;
+#   40|             0: [AssignExpr] ...=...
+#   40|               0: [VarAccess] this.full
+#   40|                 -1: [ThisAccess] this
+#   40|               1: [VarAccess] combined
diff --git a/java/ql/test/library-tests/flexible-constructors/PrintAst.qlref b/java/ql/test/library-tests/flexible-constructors/PrintAst.qlref
new file mode 100644
index 000000000000..c7fd5faf239f
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/PrintAst.qlref
@@ -0,0 +1 @@
+semmle/code/java/PrintAst.ql
\ No newline at end of file
diff --git a/java/ql/test/library-tests/flexible-constructors/options b/java/ql/test/library-tests/flexible-constructors/options
new file mode 100644
index 000000000000..7d742f19496b
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/options
@@ -0,0 +1,2 @@
+
+//semmle-extractor-options: --javac-args --release 25 --enable-preview
\ No newline at end of file

From 2a4a7337934d609dc0991d09a1f44a3f6cbfd315 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Wed, 30 Jul 2025 13:24:27 +0200
Subject: [PATCH 3/6] Java: Address review comment. Add prologue field
 initialization tests

---
 .../FlexibleConstructors.java                 | 39 +++++++-
 .../flexible-constructors/PrintAst.expected   | 90 +++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletion(-)

diff --git a/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java b/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
index 4c91e03faf95..3cd675a9cc08 100644
--- a/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
+++ b/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
@@ -32,7 +32,7 @@ class Outer {
     private final String prefix = "outer";
 
     class Inner {
-        private final String full;
+        private String full;
 
         Inner(String suffix) {
             var combined = prefix + "_" + suffix;
@@ -41,3 +41,40 @@ class Inner {
         }
     }
 }
+
+class D {
+    private final String value;
+    private final int length;
+
+    D(String input) {
+        var processed = input.toLowerCase();
+        value = processed;
+        this.length = processed.length();
+        super();
+    }
+}
+
+class E extends A {
+    private boolean isValid;
+    private String processed;
+
+    E(String data) {
+        var temp = data != null ? data.trim() : "";
+        this.processed = temp;
+        isValid = !temp.isEmpty();
+        super(temp);
+    }
+}
+
+class F {
+    private int x;
+    private final int y;
+    private int sum;
+
+    F(int a, int b) {
+        x = a;
+        this.y = b;
+        this.sum = a + b;
+        super();
+    }
+}
diff --git a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
index f4508bc0b87c..c453b424a776 100644
--- a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
+++ b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
@@ -89,3 +89,93 @@ FlexibleConstructors.java:
 #   40|               0: [VarAccess] this.full
 #   40|                 -1: [ThisAccess] this
 #   40|               1: [VarAccess] combined
+#   45|   6: [Class] D
+#   46|     1: [FieldDeclaration] String value;
+#   46|       -1: [TypeAccess] String
+#   47|     2: [FieldDeclaration] int length;
+#   47|       -1: [TypeAccess] int
+#   49|     3: [Constructor] D
+#-----|       4: (Parameters)
+#   49|         0: [Parameter] input
+#   49|           0: [TypeAccess] String
+#   49|       5: [BlockStmt] { ... }
+#   50|         0: [LocalVariableDeclStmt] var ...;
+#   50|           1: [LocalVariableDeclExpr] processed
+#   50|             0: [MethodCall] toLowerCase(...)
+#   50|               -1: [VarAccess] input
+#   51|         1: [ExprStmt] <Expr>;
+#   51|           0: [AssignExpr] ...=...
+#   51|             0: [VarAccess] value
+#   51|             1: [VarAccess] processed
+#   52|         2: [ExprStmt] <Expr>;
+#   52|           0: [AssignExpr] ...=...
+#   52|             0: [VarAccess] this.length
+#   52|               -1: [ThisAccess] this
+#   52|             1: [MethodCall] length(...)
+#   52|               -1: [VarAccess] processed
+#   53|         3: [SuperConstructorInvocationStmt] super(...)
+#   57|   7: [Class] E
+#-----|     -1: (Base Types)
+#   57|       -1: [TypeAccess] A
+#   58|     1: [FieldDeclaration] boolean isValid;
+#   58|       -1: [TypeAccess] boolean
+#   59|     2: [FieldDeclaration] String processed;
+#   59|       -1: [TypeAccess] String
+#   61|     3: [Constructor] E
+#-----|       4: (Parameters)
+#   61|         0: [Parameter] data
+#   61|           0: [TypeAccess] String
+#   61|       5: [BlockStmt] { ... }
+#   62|         0: [LocalVariableDeclStmt] var ...;
+#   62|           1: [LocalVariableDeclExpr] temp
+#   62|             0: [ConditionalExpr] ...?...:...
+#   62|               0: [NEExpr] ... != ...
+#   62|                 0: [VarAccess] data
+#   62|                 1: [NullLiteral] null
+#   62|               1: [MethodCall] trim(...)
+#   62|                 -1: [VarAccess] data
+#   62|               2: [StringLiteral] ""
+#   63|         1: [ExprStmt] <Expr>;
+#   63|           0: [AssignExpr] ...=...
+#   63|             0: [VarAccess] this.processed
+#   63|               -1: [ThisAccess] this
+#   63|             1: [VarAccess] temp
+#   64|         2: [ExprStmt] <Expr>;
+#   64|           0: [AssignExpr] ...=...
+#   64|             0: [VarAccess] isValid
+#   64|             1: [LogNotExpr] !...
+#   64|               0: [MethodCall] isEmpty(...)
+#   64|                 -1: [VarAccess] temp
+#   65|         3: [SuperConstructorInvocationStmt] super(...)
+#   65|           0: [VarAccess] temp
+#   69|   8: [Class] F
+#   70|     1: [FieldDeclaration] int x;
+#   70|       -1: [TypeAccess] int
+#   71|     2: [FieldDeclaration] int y;
+#   71|       -1: [TypeAccess] int
+#   72|     3: [FieldDeclaration] int sum;
+#   72|       -1: [TypeAccess] int
+#   74|     4: [Constructor] F
+#-----|       4: (Parameters)
+#   74|         0: [Parameter] a
+#   74|           0: [TypeAccess] int
+#   74|         1: [Parameter] b
+#   74|           0: [TypeAccess] int
+#   74|       5: [BlockStmt] { ... }
+#   75|         0: [ExprStmt] <Expr>;
+#   75|           0: [AssignExpr] ...=...
+#   75|             0: [VarAccess] x
+#   75|             1: [VarAccess] a
+#   76|         1: [ExprStmt] <Expr>;
+#   76|           0: [AssignExpr] ...=...
+#   76|             0: [VarAccess] this.y
+#   76|               -1: [ThisAccess] this
+#   76|             1: [VarAccess] b
+#   77|         2: [ExprStmt] <Expr>;
+#   77|           0: [AssignExpr] ...=...
+#   77|             0: [VarAccess] this.sum
+#   77|               -1: [ThisAccess] this
+#   77|             1: [AddExpr] ... + ...
+#   77|               0: [VarAccess] a
+#   77|               1: [VarAccess] b
+#   78|         3: [SuperConstructorInvocationStmt] super(...)

From 63f97e65be1201bb5dbdb1d1486b0a915b736757 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Mon, 18 Aug 2025 12:13:10 +0200
Subject: [PATCH 4/6] Java: add flexible constructor test including CFG
 predecessor query

---
 .../flexible-constructors/SuperPredecessor.expected   |  6 ++++++
 .../flexible-constructors/SuperPredecessor.ql         | 11 +++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
 create mode 100644 java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql

diff --git a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
new file mode 100644
index 000000000000..275692a473a5
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
@@ -0,0 +1,6 @@
+| FlexibleConstructors.java:10:15:10:17 | msg | FlexibleConstructors.java:10:9:10:19 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:18:13:18:17 | ... < ... | FlexibleConstructors.java:19:9:19:16 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:38:17:38:48 | combined | FlexibleConstructors.java:39:13:39:20 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:52:9:52:40 | ...=... | FlexibleConstructors.java:53:9:53:16 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:65:15:65:18 | temp | FlexibleConstructors.java:65:9:65:20 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:77:9:77:24 | ...=... | FlexibleConstructors.java:78:9:78:16 | super(...) | predecessor of explicit super() |
diff --git a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql
new file mode 100644
index 000000000000..2a291c5e82a3
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql
@@ -0,0 +1,11 @@
+import java
+
+from ControlFlowNode pred, ControlFlowNode supNode, SuperConstructorInvocationStmt sc
+where
+  supNode.asStmt() = sc and
+  pred.getASuccessor() = supNode and
+  pred != supNode and
+  not pred.asStmt() instanceof BlockStmt and
+  exists(sc.getEnclosingCallable().getFile().getRelativePath()) and
+  sc.getLocation().getEndColumn() > sc.getLocation().getStartColumn()
+select pred, sc, "predecessor of explicit super()"

From bfc1303d7de250190c3046c1e42d9407248cbe93 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Wed, 27 Aug 2025 08:33:37 +0200
Subject: [PATCH 5/6] Java: Add test to verify that the AST does not capture
 instance initializers

---
 .../FlexibleConstructors.java                 |  15 +++
 .../InstanceInitializerCalls.expected         |   1 +
 .../InstanceInitializerCalls.ql               |   8 ++
 .../PrettyPrint.expected                      | 124 ++++++++++++++++++
 .../flexible-constructors/PrettyPrint.ql      |   5 +
 .../flexible-constructors/PrintAst.expected   |  32 +++++
 .../SuperPredecessor.expected                 |   1 +
 .../flexible-constructors/options             |   3 +-
 8 files changed, 187 insertions(+), 2 deletions(-)
 create mode 100644 java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected
 create mode 100644 java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.ql
 create mode 100644 java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected
 create mode 100644 java/ql/test/library-tests/flexible-constructors/PrettyPrint.ql

diff --git a/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java b/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
index 3cd675a9cc08..bcd9a26f7b12 100644
--- a/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
+++ b/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
@@ -78,3 +78,18 @@ class F {
         super();
     }
 }
+
+class G {
+    private String instance_val;
+
+    {
+        instance_val = "instance";
+    }
+
+    G(String input) {
+        var tmp = input != null ? input : "default";
+        var string = tmp + "_initialized";
+        super();
+        this.instance_val = string;
+    }
+}
diff --git a/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected
new file mode 100644
index 000000000000..5f45d48a9f53
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected
@@ -0,0 +1 @@
+| FlexibleConstructors.java:31:7:31:11 | <Expr>; | 1 | <obinit> | Instance initializer call at index 1 |
diff --git a/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.ql b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.ql
new file mode 100644
index 000000000000..286137fc4524
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.ql
@@ -0,0 +1,8 @@
+import java
+
+from MethodCall call, Method m
+where
+  call.getMethod() = m and
+  m.getName() = "<obinit>"
+select call.getEnclosingStmt(), call.getEnclosingStmt().getIndex(), call.getMethod().getName(),
+  "Instance initializer call at index " + call.getEnclosingStmt().getIndex()
diff --git a/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected
new file mode 100644
index 000000000000..4ebbeaed366b
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected
@@ -0,0 +1,124 @@
+| FlexibleConstructors.java:1:7:1:7 | A | 0 | class A { |
+| FlexibleConstructors.java:1:7:1:7 | A | 1 |   A(String msg) { |
+| FlexibleConstructors.java:1:7:1:7 | A | 2 |     super(); |
+| FlexibleConstructors.java:1:7:1:7 | A | 3 |     System.out.println("A: " + msg); |
+| FlexibleConstructors.java:1:7:1:7 | A | 4 |   } |
+| FlexibleConstructors.java:1:7:1:7 | A | 5 | } |
+| FlexibleConstructors.java:7:7:7:7 | B | 0 | class B { |
+| FlexibleConstructors.java:7:7:7:7 | B | 1 |   B(String input) { |
+| FlexibleConstructors.java:7:7:7:7 | B | 2 |     var msg = input.trim().toUpperCase(); |
+| FlexibleConstructors.java:7:7:7:7 | B | 3 |     super(msg); |
+| FlexibleConstructors.java:7:7:7:7 | B | 4 |   } |
+| FlexibleConstructors.java:7:7:7:7 | B | 5 | } |
+| FlexibleConstructors.java:14:7:14:7 | C | 0 | class C { |
+| FlexibleConstructors.java:14:7:14:7 | C | 1 |   private final int x; |
+| FlexibleConstructors.java:14:7:14:7 | C | 2 |  |
+| FlexibleConstructors.java:14:7:14:7 | C | 3 |   C(int x) { |
+| FlexibleConstructors.java:14:7:14:7 | C | 4 |     if (x < 0) |
+| FlexibleConstructors.java:14:7:14:7 | C | 5 |       throw new IllegalArgumentException(); |
+| FlexibleConstructors.java:14:7:14:7 | C | 6 |     super(); |
+| FlexibleConstructors.java:14:7:14:7 | C | 7 |     this.x = x; |
+| FlexibleConstructors.java:14:7:14:7 | C | 8 |   } |
+| FlexibleConstructors.java:14:7:14:7 | C | 9 | } |
+| FlexibleConstructors.java:24:8:24:8 | R | 0 | final class R { |
+| FlexibleConstructors.java:24:8:24:8 | R | 1 |   public final boolean equals(Object p0) { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 2 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 3 |   public final int hashCode() { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 4 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 5 |   public String name() { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 6 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 7 |   public int score() { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 8 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 9 |   public final String toString() { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 10 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 11 |   R(String name, int score) { |
+| FlexibleConstructors.java:24:8:24:8 | R | 12 |     super(); |
+| FlexibleConstructors.java:24:8:24:8 | R | 13 |     this.name = name; |
+| FlexibleConstructors.java:24:8:24:8 | R | 14 |     this.score = score; |
+| FlexibleConstructors.java:24:8:24:8 | R | 15 |   } |
+| FlexibleConstructors.java:24:8:24:8 | R | 16 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 17 |   private final String name; |
+| FlexibleConstructors.java:24:8:24:8 | R | 18 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 19 |   private final int score; |
+| FlexibleConstructors.java:24:8:24:8 | R | 20 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 21 |   public R(String name) { |
+| FlexibleConstructors.java:24:8:24:8 | R | 22 |     var score = name.length(); |
+| FlexibleConstructors.java:24:8:24:8 | R | 23 |     this(name, score); |
+| FlexibleConstructors.java:24:8:24:8 | R | 24 |   } |
+| FlexibleConstructors.java:24:8:24:8 | R | 25 | } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 0 | class Outer { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 1 |   private void <obinit>() { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 2 |     prefix = "outer"; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 3 |   } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 4 |  |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 5 |   Outer() { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 6 |     super(); |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 7 |     <obinit>(); |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 8 |   } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 9 |  |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 10 |   private final String prefix; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 11 |  |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 12 |   class Inner { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 13 |     private String full; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 14 |    |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 15 |     Inner(String suffix) { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 16 |       var combined = prefix + "_" + suffix; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 17 |       super(); |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 18 |       this.full = combined; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 19 |     } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 20 |   } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 21 | } |
+| FlexibleConstructors.java:45:7:45:7 | D | 0 | class D { |
+| FlexibleConstructors.java:45:7:45:7 | D | 1 |   private final String value; |
+| FlexibleConstructors.java:45:7:45:7 | D | 2 |  |
+| FlexibleConstructors.java:45:7:45:7 | D | 3 |   private final int length; |
+| FlexibleConstructors.java:45:7:45:7 | D | 4 |  |
+| FlexibleConstructors.java:45:7:45:7 | D | 5 |   D(String input) { |
+| FlexibleConstructors.java:45:7:45:7 | D | 6 |     var processed = input.toLowerCase(); |
+| FlexibleConstructors.java:45:7:45:7 | D | 7 |     value = processed; |
+| FlexibleConstructors.java:45:7:45:7 | D | 8 |     this.length = processed.length(); |
+| FlexibleConstructors.java:45:7:45:7 | D | 9 |     super(); |
+| FlexibleConstructors.java:45:7:45:7 | D | 10 |   } |
+| FlexibleConstructors.java:45:7:45:7 | D | 11 | } |
+| FlexibleConstructors.java:57:7:57:7 | E | 0 | class E { |
+| FlexibleConstructors.java:57:7:57:7 | E | 1 |   private boolean isValid; |
+| FlexibleConstructors.java:57:7:57:7 | E | 2 |  |
+| FlexibleConstructors.java:57:7:57:7 | E | 3 |   private String processed; |
+| FlexibleConstructors.java:57:7:57:7 | E | 4 |  |
+| FlexibleConstructors.java:57:7:57:7 | E | 5 |   E(String data) { |
+| FlexibleConstructors.java:57:7:57:7 | E | 6 |     var temp = data != null ? data.trim() : ""; |
+| FlexibleConstructors.java:57:7:57:7 | E | 7 |     this.processed = temp; |
+| FlexibleConstructors.java:57:7:57:7 | E | 8 |     isValid = !temp.isEmpty(); |
+| FlexibleConstructors.java:57:7:57:7 | E | 9 |     super(temp); |
+| FlexibleConstructors.java:57:7:57:7 | E | 10 |   } |
+| FlexibleConstructors.java:57:7:57:7 | E | 11 | } |
+| FlexibleConstructors.java:69:7:69:7 | F | 0 | class F { |
+| FlexibleConstructors.java:69:7:69:7 | F | 1 |   private int x; |
+| FlexibleConstructors.java:69:7:69:7 | F | 2 |  |
+| FlexibleConstructors.java:69:7:69:7 | F | 3 |   private final int y; |
+| FlexibleConstructors.java:69:7:69:7 | F | 4 |  |
+| FlexibleConstructors.java:69:7:69:7 | F | 5 |   private int sum; |
+| FlexibleConstructors.java:69:7:69:7 | F | 6 |  |
+| FlexibleConstructors.java:69:7:69:7 | F | 7 |   F(int a, int b) { |
+| FlexibleConstructors.java:69:7:69:7 | F | 8 |     x = a; |
+| FlexibleConstructors.java:69:7:69:7 | F | 9 |     this.y = b; |
+| FlexibleConstructors.java:69:7:69:7 | F | 10 |     this.sum = a + b; |
+| FlexibleConstructors.java:69:7:69:7 | F | 11 |     super(); |
+| FlexibleConstructors.java:69:7:69:7 | F | 12 |   } |
+| FlexibleConstructors.java:69:7:69:7 | F | 13 | } |
+| FlexibleConstructors.java:82:7:82:7 | G | 0 | class G { |
+| FlexibleConstructors.java:82:7:82:7 | G | 1 |   private void <obinit>() { |
+| FlexibleConstructors.java:82:7:82:7 | G | 2 |     { |
+| FlexibleConstructors.java:82:7:82:7 | G | 3 |       instance_val = "instance"; |
+| FlexibleConstructors.java:82:7:82:7 | G | 4 |     } |
+| FlexibleConstructors.java:82:7:82:7 | G | 5 |   } |
+| FlexibleConstructors.java:82:7:82:7 | G | 6 |  |
+| FlexibleConstructors.java:82:7:82:7 | G | 7 |   private String instance_val; |
+| FlexibleConstructors.java:82:7:82:7 | G | 8 |  |
+| FlexibleConstructors.java:82:7:82:7 | G | 9 |   G(String input) { |
+| FlexibleConstructors.java:82:7:82:7 | G | 10 |     var tmp = input != null ? input : "default"; |
+| FlexibleConstructors.java:82:7:82:7 | G | 11 |     var string = tmp + "_initialized"; |
+| FlexibleConstructors.java:82:7:82:7 | G | 12 |     super(); |
+| FlexibleConstructors.java:82:7:82:7 | G | 13 |     this.instance_val = string; |
+| FlexibleConstructors.java:82:7:82:7 | G | 14 |   } |
+| FlexibleConstructors.java:82:7:82:7 | G | 15 | } |
diff --git a/java/ql/test/library-tests/flexible-constructors/PrettyPrint.ql b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.ql
new file mode 100644
index 000000000000..59ae62effd1b
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.ql
@@ -0,0 +1,5 @@
+import semmle.code.java.PrettyPrintAst
+
+from ClassOrInterface cori, string s, int line
+where pp(cori, s, line) and cori.fromSource()
+select cori, line, s
diff --git a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
index c453b424a776..618448a567d2 100644
--- a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
+++ b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
@@ -179,3 +179,35 @@ FlexibleConstructors.java:
 #   77|               0: [VarAccess] a
 #   77|               1: [VarAccess] b
 #   78|         3: [SuperConstructorInvocationStmt] super(...)
+#   82|   9: [Class] G
+#   83|     2: [FieldDeclaration] String instance_val;
+#   83|       -1: [TypeAccess] String
+#   85|     3: [BlockStmt] { ... }
+#   86|       0: [ExprStmt] <Expr>;
+#   86|         0: [AssignExpr] ...=...
+#   86|           0: [VarAccess] instance_val
+#   86|           1: [StringLiteral] "instance"
+#   89|     4: [Constructor] G
+#-----|       4: (Parameters)
+#   89|         0: [Parameter] input
+#   89|           0: [TypeAccess] String
+#   89|       5: [BlockStmt] { ... }
+#   90|         0: [LocalVariableDeclStmt] var ...;
+#   90|           1: [LocalVariableDeclExpr] tmp
+#   90|             0: [ConditionalExpr] ...?...:...
+#   90|               0: [NEExpr] ... != ...
+#   90|                 0: [VarAccess] input
+#   90|                 1: [NullLiteral] null
+#   90|               1: [VarAccess] input
+#   90|               2: [StringLiteral] "default"
+#   91|         1: [LocalVariableDeclStmt] var ...;
+#   91|           1: [LocalVariableDeclExpr] string
+#   91|             0: [AddExpr] ... + ...
+#   91|               0: [VarAccess] tmp
+#   91|               1: [StringLiteral] "_initialized"
+#   92|         2: [SuperConstructorInvocationStmt] super(...)
+#   93|         3: [ExprStmt] <Expr>;
+#   93|           0: [AssignExpr] ...=...
+#   93|             0: [VarAccess] this.instance_val
+#   93|               -1: [ThisAccess] this
+#   93|             1: [VarAccess] string
diff --git a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
index 275692a473a5..dba8b4acf988 100644
--- a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
+++ b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
@@ -4,3 +4,4 @@
 | FlexibleConstructors.java:52:9:52:40 | ...=... | FlexibleConstructors.java:53:9:53:16 | super(...) | predecessor of explicit super() |
 | FlexibleConstructors.java:65:15:65:18 | temp | FlexibleConstructors.java:65:9:65:20 | super(...) | predecessor of explicit super() |
 | FlexibleConstructors.java:77:9:77:24 | ...=... | FlexibleConstructors.java:78:9:78:16 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:91:13:91:41 | string | FlexibleConstructors.java:92:9:92:16 | super(...) | predecessor of explicit super() |
diff --git a/java/ql/test/library-tests/flexible-constructors/options b/java/ql/test/library-tests/flexible-constructors/options
index 7d742f19496b..db1dc01e53b7 100644
--- a/java/ql/test/library-tests/flexible-constructors/options
+++ b/java/ql/test/library-tests/flexible-constructors/options
@@ -1,2 +1 @@
-
-//semmle-extractor-options: --javac-args --release 25 --enable-preview
\ No newline at end of file
+//semmle-extractor-options: --javac-args --release 25 --enable-preview

From 9cf867ea3a20337b83c291dfe68635d37bdc9158 Mon Sep 17 00:00:00 2001
From: idrissrio <idrissrio@github.com>
Date: Wed, 27 Aug 2025 08:37:29 +0200
Subject: [PATCH 6/6] Java: Accept new test result after extractor changes

---
 .../InstanceInitializerCalls.expected                      | 1 +
 .../flexible-constructors/PrettyPrint.expected             | 7 ++++---
 .../library-tests/flexible-constructors/PrintAst.expected  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected
index 5f45d48a9f53..75a112fe2082 100644
--- a/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected
+++ b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected
@@ -1 +1,2 @@
 | FlexibleConstructors.java:31:7:31:11 | <Expr>; | 1 | <obinit> | Instance initializer call at index 1 |
+| FlexibleConstructors.java:89:5:89:5 | <Expr>; | 3 | <obinit> | Instance initializer call at index 3 |
diff --git a/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected
index 4ebbeaed366b..d90e8b8f831f 100644
--- a/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected
+++ b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected
@@ -119,6 +119,7 @@
 | FlexibleConstructors.java:82:7:82:7 | G | 10 |     var tmp = input != null ? input : "default"; |
 | FlexibleConstructors.java:82:7:82:7 | G | 11 |     var string = tmp + "_initialized"; |
 | FlexibleConstructors.java:82:7:82:7 | G | 12 |     super(); |
-| FlexibleConstructors.java:82:7:82:7 | G | 13 |     this.instance_val = string; |
-| FlexibleConstructors.java:82:7:82:7 | G | 14 |   } |
-| FlexibleConstructors.java:82:7:82:7 | G | 15 | } |
+| FlexibleConstructors.java:82:7:82:7 | G | 13 |     <obinit>(); |
+| FlexibleConstructors.java:82:7:82:7 | G | 14 |     this.instance_val = string; |
+| FlexibleConstructors.java:82:7:82:7 | G | 15 |   } |
+| FlexibleConstructors.java:82:7:82:7 | G | 16 | } |
diff --git a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
index 618448a567d2..e8071db72f7d 100644
--- a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
+++ b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
@@ -206,7 +206,7 @@ FlexibleConstructors.java:
 #   91|               0: [VarAccess] tmp
 #   91|               1: [StringLiteral] "_initialized"
 #   92|         2: [SuperConstructorInvocationStmt] super(...)
-#   93|         3: [ExprStmt] <Expr>;
+#   93|         4: [ExprStmt] <Expr>;
 #   93|           0: [AssignExpr] ...=...
 #   93|             0: [VarAccess] this.instance_val
 #   93|               -1: [ThisAccess] this