FE: do not wrap types with enhancements if they're the same

compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.fir.kt

@@ -0,0 +1,17 @@
+// JSPECIFY_STATE: strict
+// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
+// FILE: J1.java
+import org.jetbrains.annotations.Nullable;
+
+public interface J1<T> {
+    @Nullable
+    public static <T> T foo(J1<T> x) { return null; }
+}
+
+// FILE: J2.java
+import org.jspecify.nullness.Nullable;
+
+public interface J2<V extends @Nullable Object> extends J1<V> { }
+
+// FILE: kotlin.kt
+private fun J2<*>.bar() = J1.foo(this)

compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.fir.txt

@@ -0,0 +1,18 @@
+package
+
+private fun J2<*>.bar(): @org.jspecify.nullness.Nullable kotlin.Any?
+
+public interface J1</*0*/ T : kotlin.Any!> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    @org.jetbrains.annotations.Nullable public open fun </*0*/ T : kotlin.Any!> foo(/*0*/ x: J1<T!>!): @org.jetbrains.annotations.Nullable T?
+}
+
+public interface J2</*0*/ V> : J1<V> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.kt

@@ -0,0 +1,17 @@
+// JSPECIFY_STATE: strict
+// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
+// FILE: J1.java
+import org.jetbrains.annotations.Nullable;
+
+public interface J1<T> {
+    @Nullable
+    public static <T> T foo(J1<T> x) { return null; }
+}
+
+// FILE: J2.java
+import org.jspecify.nullness.Nullable;
+
+public interface J2<V extends @Nullable Object> extends J1<V> { }
+
+// FILE: kotlin.kt
+private fun J2<*>.bar() = J1.foo(this)

compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.txt

@@ -0,0 +1,18 @@
+package
+
+private fun J2<*>.bar(): @org.jspecify.nullness.Nullable kotlin.Any?
+
+public interface J1</*0*/ T : kotlin.Any!> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    @org.jetbrains.annotations.Nullable public open fun </*0*/ T : kotlin.Any!> foo(/*0*/ x: J1<T!>!): @org.jetbrains.annotations.Nullable T?
+}
+
+public interface J2</*0*/ V> : J1<V> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.fir.kt

@@ -0,0 +1,16 @@
+// JSPECIFY_STATE: warn
+// FILE: J1.java
+import org.jetbrains.annotations.Nullable;
+
+public interface J1<T> {
+    @Nullable
+    public static <T> T foo(J1<T> x) { return null; }
+}
+
+// FILE: J2.java
+import org.jspecify.nullness.Nullable;
+
+public interface J2<V extends @Nullable Object> extends J1<V> { }
+
+// FILE: kotlin.kt
+private fun J2<*>.bar() = J1.foo(this)

compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.fir.txt

@@ -0,0 +1,18 @@
+package
+
+private fun J2<*>.bar(): @org.jspecify.nullness.Nullable kotlin.Any?
+
+public interface J1</*0*/ T : kotlin.Any!> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    @org.jetbrains.annotations.Nullable public open fun </*0*/ T : kotlin.Any!> foo(/*0*/ x: J1<T!>!): @org.jetbrains.annotations.Nullable T?
+}
+
+public interface J2</*0*/ V : @org.jspecify.nullness.Nullable kotlin.Any!> : J1<V!> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt

@@ -0,0 +1,16 @@
+// JSPECIFY_STATE: warn
+// FILE: J1.java
+import org.jetbrains.annotations.Nullable;
+
+public interface J1<T> {
+    @Nullable
+    public static <T> T foo(J1<T> x) { return null; }
+}
+
+// FILE: J2.java
+import org.jspecify.nullness.Nullable;
+
+public interface J2<V extends @Nullable Object> extends J1<V> { }
+
+// FILE: kotlin.kt
+private fun J2<*>.bar() = J1.foo(this)

compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.txt

@@ -0,0 +1,18 @@
+package
+
+private fun J2<*>.bar(): @org.jspecify.nullness.Nullable kotlin.Any?
+
+public interface J1</*0*/ T : kotlin.Any!> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    @org.jetbrains.annotations.Nullable public open fun </*0*/ T : kotlin.Any!> foo(/*0*/ x: J1<T!>!): @org.jetbrains.annotations.Nullable T?
+}
+
+public interface J2</*0*/ V : @org.jspecify.nullness.Nullable kotlin.Any!> : J1<V!> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java

@@ -636,6 +636,18 @@ public class ForeignAnnotationsCompiledJavaTestGenerated extends AbstractForeign
                     runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt");
                 }
 
+                @Test
+                @TestMetadata("Captured.kt")
+                public void testCaptured() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.kt");
+                }
+
+                @Test
+                @TestMetadata("Captured.fir.kt")
+                public void testCaptured_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.fir.kt");
+                }
+
                 @Test
                 @TestMetadata("Defaults.kt")
                 public void testDefaults() throws Exception {
@@ -784,6 +796,18 @@ public class ForeignAnnotationsCompiledJavaTestGenerated extends AbstractForeign
                     runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt");
                 }
 
+                @Test
+                @TestMetadata("Captured.kt")
+                public void testCaptured() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt");
+                }
+
+                @Test
+                @TestMetadata("Captured.fir.kt")
+                public void testCaptured_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.fir.kt");
+                }
+
                 @Test
                 @TestMetadata("Defaults.kt")
                 public void testDefaults() throws Exception {

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java

@@ -636,6 +636,18 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte
                     runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt");
                 }
 
+                @Test
+                @TestMetadata("Captured.kt")
+                public void testCaptured() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.kt");
+                }
+
+                @Test
+                @TestMetadata("Captured.fir.kt")
+                public void testCaptured_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.fir.kt");
+                }
+
                 @Test
                 @TestMetadata("Defaults.kt")
                 public void testDefaults() throws Exception {
@@ -784,6 +796,18 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte
                     runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt");
                 }
 
+                @Test
+                @TestMetadata("Captured.kt")
+                public void testCaptured() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt");
+                }
+
+                @Test
+                @TestMetadata("Captured.fir.kt")
+                public void testCaptured_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.fir.kt");
+                }
+
                 @Test
                 @TestMetadata("Defaults.kt")
                 public void testDefaults() throws Exception {

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java

@@ -636,6 +636,18 @@ public class ForeignAnnotationsSourceJavaTestGenerated extends AbstractForeignAn
                     runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt");
                 }
 
+                @Test
+                @TestMetadata("Captured.kt")
+                public void testCaptured() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.kt");
+                }
+
+                @Test
+                @TestMetadata("Captured.fir.kt")
+                public void testCaptured_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.fir.kt");
+                }
+
                 @Test
                 @TestMetadata("Defaults.kt")
                 public void testDefaults() throws Exception {
@@ -784,6 +796,18 @@ public class ForeignAnnotationsSourceJavaTestGenerated extends AbstractForeignAn
                     runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt");
                 }
 
+                @Test
+                @TestMetadata("Captured.kt")
+                public void testCaptured() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt");
+                }
+
+                @Test
+                @TestMetadata("Captured.fir.kt")
+                public void testCaptured_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.fir.kt");
+                }
+
                 @Test
                 @TestMetadata("Defaults.kt")
                 public void testDefaults() throws Exception {

core/descriptors/src/org/jetbrains/kotlin/types/TypeWithEnhancement.kt

@@ -159,7 +159,7 @@ fun UnwrappedType.wrapEnhancement(enhancement: KotlinType?): UnwrappedType {
     if (this is TypeWithEnhancement) {
         return origin.wrapEnhancement(enhancement)
     }
-    if (enhancement == null) {
+    if (enhancement == null || enhancement == this) {
         return this
     }
     return when (this) {