From d4e5479f0f312d193fe4ced7d773f2bd64637e33 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Wed, 17 Jun 2015 17:37:05 +0300
Subject: [PATCH] Update testData for nullability warnings

They become errors after type enhancement
---
 .../nullabilityWarnings/arithmetic.kt         | 16 +++++++--------
 .../nullabilityWarnings/arithmetic.txt        |  4 ++--
 .../nullabilityWarnings/array.kt              |  4 ++--
 .../nullabilityWarnings/array.txt             |  4 ++--
 .../nullabilityWarnings/assignToVar.kt        |  2 +-
 .../nullabilityWarnings/assignToVar.txt       |  4 ++--
 .../nullabilityWarnings/conditions.kt         | 12 +++++------
 .../nullabilityWarnings/conditions.txt        |  4 ++--
 .../nullabilityWarnings/dataFlowInfo.kt       | 12 +++++------
 .../nullabilityWarnings/dataFlowInfo.txt      |  4 ++--
 .../nullabilityWarnings/defaultParameters.kt  |  2 +-
 .../nullabilityWarnings/defaultParameters.txt |  4 ++--
 .../delegatedProperties.kt                    |  2 +-
 .../delegatedProperties.txt                   |  6 +++---
 .../nullabilityWarnings/delegation.kt         |  2 +-
 .../nullabilityWarnings/delegation.txt        |  4 ++--
 .../nullabilityWarnings/derefenceExtension.kt |  4 ++--
 .../derefenceExtension.txt                    |  4 ++--
 .../nullabilityWarnings/derefenceMember.kt    |  4 ++--
 .../nullabilityWarnings/derefenceMember.txt   |  4 ++--
 .../nullabilityWarnings/elvis.txt             |  4 ++--
 .../nullabilityWarnings/expectedType.kt       |  2 +-
 .../nullabilityWarnings/expectedType.txt      |  4 ++--
 .../platformTypes/nullabilityWarnings/for.kt  |  2 +-
 .../platformTypes/nullabilityWarnings/for.txt |  4 ++--
 .../nullabilityWarnings/functionArguments.kt  |  2 +-
 .../nullabilityWarnings/functionArguments.txt |  4 ++--
 .../inferenceInConditionals.txt               |  4 ++--
 .../nullabilityWarnings/invoke.kt             |  2 +-
 .../nullabilityWarnings/invoke.txt            |  4 ++--
 .../nullabilityWarnings/kt6829.txt            |  2 +-
 .../nullabilityWarnings/multiDeclaration.kt   |  2 +-
 .../nullabilityWarnings/multiDeclaration.txt  |  4 ++--
 .../notNullAfterSafeCall.txt                  |  2 +-
 .../nullabilityWarnings/notNullAssertion.txt  |  4 ++--
 .../notNullAssertionInCall.txt                |  2 +-
 ...otNullTypeMarkedWithNullableAnnotation.txt |  2 +-
 .../nullabilityWarnings/passToJava.kt         | 20 +++++++++----------
 .../nullabilityWarnings/passToJava.txt        | 14 ++++++-------
 .../nullabilityWarnings/primitiveArray.kt     |  4 ++--
 .../nullabilityWarnings/primitiveArray.txt    |  4 ++--
 .../nullabilityWarnings/safeCall.txt          |  4 ++--
 .../senselessComparisonEquals.txt             |  4 ++--
 .../senselessComparisonIdentityEquals.txt     |  4 ++--
 .../nullabilityWarnings/throw.kt              |  2 +-
 .../nullabilityWarnings/throw.txt             |  4 ++--
 .../uselessElvisInCall.txt                    |  2 +-
 47 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
index 31a29d95c56..92006839405 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
@@ -21,35 +21,35 @@ fun test() {
     var platformJ = J.staticJ
 
     +platformNN
-    +<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>
+    <!UNSAFE_CALL!>+<!>platformN
     +platformJ
 
     ++platformNN
-    ++<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>
+    <!UNSAFE_CALL!>++<!>platformN
     ++platformJ
 
     platformNN++
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>++
+    platformN<!UNSAFE_CALL!>++<!>
     platformJ++
 
     1 + platformNN
-    1 + <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>
+    1 <!NONE_APPLICABLE!>+<!> platformN
     1 + platformJ
 
     platformNN + 1
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!> + 1
+    platformN <!UNSAFE_INFIX_CALL!>+<!> 1
     platformJ + 1
 
     1 plus platformNN
-    1 plus <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>
+    1 <!NONE_APPLICABLE!>plus<!> platformN
     1 plus platformJ
 
     platformNN plus 1
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!> plus 1
+    platformN <!UNSAFE_INFIX_CALL!>plus<!> 1
     platformJ plus 1
 
     platformNN += 1
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!> += 1
+    platformN <!UNSAFE_INFIX_CALL!>+=<!> 1
     platformJ += 1
 }
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
index 7144141c3ca..70ddc963fab 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.Int!
-    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Int!
-    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Int!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Int?
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Int
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt
index 928f061ef8d..acf93ae0567 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt
@@ -21,11 +21,11 @@ fun test() {
     val platformJ = J.staticJ
 
     platformNN[0]
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>[0]
+    <!UNSAFE_CALL!>platformN[0]<!>
     platformJ[0]
 
     platformNN[0] = 1
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>[0]  = 1
+    <!UNSAFE_CALL!>platformN[0]<!>  = 1
     platformJ[0]  = 1
 }
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
index 5fd62c6b767..75a3de97607 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.Array<(out) kotlin.Int!>!
-    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Array<(out) kotlin.Int!>!
-    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Array<(out) kotlin.Int!>!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Array<(out) kotlin.Int!>?
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Array<(out) kotlin.Int!>
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
index 478a0ae9708..712431e8132 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
@@ -17,7 +17,7 @@ var n: J? = J()
 
 fun test() {
     v = J.staticNN
-    v = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>
+    v = <!TYPE_MISMATCH!>J.staticN<!>
     v = J.staticJ
 
     n = J.staticNN
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
index 4715dbb23bc..1e4d0befe73 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
@@ -12,6 +12,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
index c9e785bb6d3..4f322c6cd65 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
@@ -22,26 +22,26 @@ fun test() {
     val platformJ = J.staticJ
 
     if (platformNN) {}
-    if (<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>) {}
+    if (<!TYPE_MISMATCH, TYPE_MISMATCH_IN_CONDITION!>platformN<!>) {}
     if (platformJ) {}
 
     while (platformNN) {}
-    while (<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>) {}
+    while (<!TYPE_MISMATCH, TYPE_MISMATCH_IN_CONDITION!>platformN<!>) {}
     while (platformJ) {}
 
     do {} while (platformNN)
-    do {} while (<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>)
+    do {} while (<!TYPE_MISMATCH, TYPE_MISMATCH_IN_CONDITION!>platformN<!>)
     do {} while (platformJ)
 
     platformNN && false
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!> && false
+    <!TYPE_MISMATCH!>platformN<!> && false
     platformJ && false
 
     platformNN || false
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!> || false
+    <!TYPE_MISMATCH!>platformN<!> || false
     platformJ || false
 
     !platformNN
-    !<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>
+    <!UNSAFE_CALL!>!<!>platformN
     !platformJ
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
index 65c7261ddc6..3febba97fa0 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.Boolean!
-    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Boolean!
-    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Boolean!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Boolean?
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Boolean
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
index e716abbe6a8..bb8ff0a9c87 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
@@ -14,17 +14,17 @@ public class J {
 
 fun test() {
     val n = J.staticN
-    foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>)
-    J.staticNN = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>
+    foo(<!TYPE_MISMATCH!>n<!>)
+    J.staticNN = <!TYPE_MISMATCH!>n<!>
     if (n != null) {
-        foo(n)
-        J.staticNN = n
+        foo(<!DEBUG_INFO_SMARTCAST!>n<!>)
+        J.staticNN = <!DEBUG_INFO_SMARTCAST!>n<!>
     }
 
     val x: J? = null
-    J.staticNN = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>x<!>
+    J.staticNN = <!TYPE_MISMATCH!>x<!>
     if (x != null) {
-        J.staticNN = x
+        J.staticNN = <!DEBUG_INFO_SMARTCAST!>x<!>
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
index 64f161d3f05..62c2956663a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
@@ -10,6 +10,6 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
index 3cbba78872d..4c6d2fc62aa 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
@@ -21,7 +21,7 @@ fun test() {
     // platform type with no annotation
     val platformJ = J.staticJ
 
-    fun foo(p: J = platformNN, p1: J = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>, p2: J = platformJ) {}
+    fun foo(p: J = platformNN, p1: J = <!TYPE_MISMATCH!>platformN<!>, p2: J = platformJ) {}
 
     fun foo1(p: J? = platformNN, p1: J? = platformN, p2: J? = platformJ) {}
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
index 34903ffd954..337b583c502 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt
index e413b1e74fd..129ee20826e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt
@@ -19,5 +19,5 @@ public class J {
 // FILE: k.kt
 
 var A by J.staticNN
-var B by <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS, NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>
+var B by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>J.staticN<!>
 var C by J.staticJ
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
index 4face54f705..c254131e578 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
@@ -1,7 +1,7 @@
 package
 
 internal var A: kotlin.String!
-internal var B: kotlin.String!
+internal var B: [ERROR : Type from delegate]
 internal var C: kotlin.String!
 
 public open class J {
@@ -20,6 +20,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J.DP!
-    org.jetbrains.annotations.Nullable() public final var staticN: J.DP!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J.DP!
+    org.jetbrains.annotations.Nullable() public final var staticN: J.DP?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J.DP
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
index bf012440dde..5970a02c277 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
@@ -14,5 +14,5 @@ public class J {
 // FILE: k.kt
 
 class A : List<String> by J.staticNN
-class B : List<String> by <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>
+class B : List<String> by <!TYPE_MISMATCH!>J.staticN<!>
 class C : List<String> by J.staticJ
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
index c3c73d2853b..113e6c04242 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
@@ -62,6 +62,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.(Mutable)List<kotlin.String!>!
-    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.(Mutable)List<kotlin.String!>!
-    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.(Mutable)List<kotlin.String!>!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.(Mutable)List<kotlin.String!>?
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.(Mutable)List<kotlin.String!>
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt
index 5c96709c95e..03812dbf1ba 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt
@@ -23,14 +23,14 @@ fun test() {
     val platformJ = J.staticJ
 
     platformNN.foo()
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>.foo()
+    platformN<!UNSAFE_CALL!>.<!>foo()
     platformJ.foo()
 
     with(platformNN) {
         foo()
     }
     with(platformN) {
-        <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>foo<!>()
+        <!UNSAFE_CALL!>foo<!>()
     }
     with(platformJ) {
         foo()
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt
index 71f08415efa..9291b06c1bd 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt
@@ -13,6 +13,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt
index b0f108a737b..a62b4e4c2fb 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt
@@ -25,14 +25,14 @@ fun test() {
     val platformJ = J.staticJ
 
     platformNN.foo()
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>.foo()
+    platformN<!UNSAFE_CALL!>.<!>foo()
     platformJ.foo()
 
     with(platformNN) {
         foo()
     }
     with(platformN) {
-        <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>foo<!>()
+        <!UNSAFE_CALL!>foo<!>()
     }
     with(platformJ) {
         foo()
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt
index 8c9b73aa0f6..5b7f1851a98 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt
@@ -12,6 +12,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
index 34903ffd954..337b583c502 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt
index 5001e655040..9879205a921 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt
@@ -23,7 +23,7 @@ fun test() {
     val platformJ = J.staticJ
 
     checkSubtype<J>(platformNN)
-    checkSubtype<J>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>)
+    checkSubtype<J>(<!TYPE_MISMATCH!>platformN<!>)
     checkSubtype<J>(platformJ)
 
     checkSubtype<J?>(platformNN)
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
index 34903ffd954..337b583c502 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt
index d15f6d928aa..4dad6907875 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt
@@ -22,7 +22,7 @@ fun test() {
     val platformJ = J.staticJ
 
     for (x in platformNN) {}
-    for (x in <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>) {}
+    for (x in <!ITERATOR_MISSING!>platformN<!>) {}
     for (x in platformJ) {}
 }
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
index 011c6034370..fa7da09107d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.(Mutable)List<kotlin.String!>!
-    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.(Mutable)List<kotlin.String!>!
-    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.(Mutable)List<kotlin.String!>!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.(Mutable)List<kotlin.String!>?
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.(Mutable)List<kotlin.String!>
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt
index 228464fceba..824731bebdb 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt
@@ -15,7 +15,7 @@ public class J {
 
 fun test() {
     foo(J.staticNN)
-    foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>)
+    foo(<!TYPE_MISMATCH!>J.staticN<!>)
     foo(J.staticJ)
 
     bar(J.staticNN)
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
index 818aef0eb85..594f4dd052f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
@@ -12,6 +12,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
index 3ed6cbe4fb4..0e614823af9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
@@ -8,7 +8,7 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    org.jetbrains.annotations.Nullable() public open fun n(): kotlin.(Mutable)List<kotlin.String!>!
-    org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String!
+    org.jetbrains.annotations.Nullable() public open fun n(): kotlin.(Mutable)List<kotlin.String!>?
+    org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt
index 0b055a57320..951251b949f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt
@@ -18,7 +18,7 @@ public class J {
 
 fun test() {
     J.staticNN()
-    J.<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>staticN<!>()
+    J.<!UNSAFE_CALL!>staticN<!>()
     J.staticJ()
 }
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
index fec729f8aa7..12dc37e9833 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
@@ -17,7 +17,7 @@ public open class J {
 
     // Static members
     public final var staticJ: J.Invoke!
-    org.jetbrains.annotations.Nullable() public final var staticN: J.Invoke!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J.Invoke!
+    org.jetbrains.annotations.Nullable() public final var staticN: J.Invoke?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J.Invoke
     public final /*synthesized*/ fun Invoke(/*0*/ function: () -> kotlin.Unit): J.Invoke
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
index 099ffe5132d..4498b5ea58e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
@@ -7,6 +7,6 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    org.jetbrains.annotations.Nullable() public open fun method(): kotlin.String!
+    org.jetbrains.annotations.Nullable() public open fun method(): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt
index 977f804794b..996ce6fc410 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt
@@ -27,7 +27,7 @@ fun test() {
     val platformJ = J.staticJ
 
     val (a1, b1) = platformNN
-    val (a2, b2) = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS, NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>
+    val (a2, b2) = <!COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING!>platformN<!>
     val (a3, b3) = platformJ
 }
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
index 66977b314a7..6d630b5f0e1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
@@ -18,6 +18,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J.Multi!
-    org.jetbrains.annotations.Nullable() public final var staticN: J.Multi!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J.Multi!
+    org.jetbrains.annotations.Nullable() public final var staticN: J.Multi?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J.Multi
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
index 95590d06e57..ecb6bc198c1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
@@ -6,6 +6,6 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String!
+    org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
index 34903ffd954..337b583c502 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt
index adf9031c655..344c25b69e4 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt
@@ -18,5 +18,5 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
index aea2df5eedd..f362d5abae8 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
@@ -6,6 +6,6 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    org.jetbrains.annotations.Nullable() public open fun n(): kotlin.(Mutable)List<kotlin.String!>!
+    org.jetbrains.annotations.Nullable() public open fun n(): kotlin.(Mutable)List<kotlin.String!>?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
index 257badf0b86..95aa5173dce 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
@@ -33,8 +33,8 @@ fun test(n: J?, nn: J) {
     // platform type with no annotation
     val platformJ = J.staticJ
 
-    J.staticNN = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>
-    J.staticNN = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>
+    J.staticNN = <!TYPE_MISMATCH!>n<!>
+    J.staticNN = <!TYPE_MISMATCH!>platformN<!>
     J.staticNN = nn
     J.staticNN = platformNN
     J.staticNN = platformJ
@@ -53,12 +53,12 @@ fun test(n: J?, nn: J) {
 
     J.staticSet(nn, nn, nn)
     J.staticSet(platformNN, platformNN, platformNN)
-    J.staticSet(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>, n, n)
-    J.staticSet(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>, platformN, platformN)
+    J.staticSet(<!TYPE_MISMATCH!>n<!>, n, n)
+    J.staticSet(<!TYPE_MISMATCH!>platformN<!>, platformN, platformN)
     J.staticSet(platformJ, platformJ, platformJ)
 
-    J().nn = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>
-    J().nn = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>
+    J().nn = <!TYPE_MISMATCH!>n<!>
+    J().nn = <!TYPE_MISMATCH!>platformN<!>
     J().nn = nn
     J().nn = platformNN
     J().nn = platformJ
@@ -77,13 +77,13 @@ fun test(n: J?, nn: J) {
 
     J().set(nn, nn, nn)
     J().set(platformNN, platformNN, platformNN)
-    J().set(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>, n, n)
-    J().set(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>, platformN, platformN)
+    J().set(<!TYPE_MISMATCH!>n<!>, n, n)
+    J().set(<!TYPE_MISMATCH!>platformN<!>, platformN, platformN)
     J().set(platformJ, platformJ, platformJ)
 
     J(nn, nn, nn)
     J(platformNN, platformNN, platformNN)
-    J(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>, n, n)
-    J(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>, platformN, platformN)
+    <!NONE_APPLICABLE!>J<!>(n, n, n)
+    <!NONE_APPLICABLE!>J<!>(platformN, platformN, platformN)
     J(platformJ, platformJ, platformJ)
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
index f1c3b9d5460..1167bc6af33 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
@@ -4,18 +4,18 @@ internal fun test(/*0*/ n: J?, /*1*/ nn: J): kotlin.Unit
 
 public open class J {
     public constructor J()
-    public constructor J(/*0*/ org.jetbrains.annotations.NotNull() nn: J!, /*1*/ org.jetbrains.annotations.Nullable() n: J!, /*2*/ j: J!)
+    public constructor J(/*0*/ org.jetbrains.annotations.NotNull() nn: J, /*1*/ org.jetbrains.annotations.Nullable() n: J?, /*2*/ j: J!)
     public final var j: J!
-    org.jetbrains.annotations.Nullable() public final var n: J!
-    org.jetbrains.annotations.NotNull() public final var nn: J!
+    org.jetbrains.annotations.Nullable() public final var n: J?
+    org.jetbrains.annotations.NotNull() public final var nn: J
     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 fun set(/*0*/ org.jetbrains.annotations.NotNull() nn: J!, /*1*/ org.jetbrains.annotations.Nullable() n: J!, /*2*/ j: J!): kotlin.Unit
+    public open fun set(/*0*/ org.jetbrains.annotations.NotNull() nn: J, /*1*/ org.jetbrains.annotations.Nullable() n: J?, /*2*/ j: J!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
-    public open fun staticSet(/*0*/ org.jetbrains.annotations.NotNull() nn: J!, /*1*/ org.jetbrains.annotations.Nullable() n: J!, /*2*/ j: J!): kotlin.Unit
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
+    public open fun staticSet(/*0*/ org.jetbrains.annotations.NotNull() nn: J, /*1*/ org.jetbrains.annotations.Nullable() n: J?, /*2*/ j: J!): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt
index 75d088a0078..63d41a2ccb6 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt
@@ -21,11 +21,11 @@ fun test() {
     val platformJ = J.staticJ
 
     platformNN[0]
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>[0]
+    <!UNSAFE_CALL!>platformN[0]<!>
     platformJ[0]
 
     platformNN[0] = 1
-    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>[0]  = 1
+    <!UNSAFE_CALL!>platformN[0]<!>  = 1
     platformJ[0]  = 1
 }
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
index ff4baf160aa..549e6a94cdc 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: kotlin.IntArray!
-    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.IntArray!
-    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.IntArray!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.IntArray?
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.IntArray
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
index c29fb5ad665..7b24a77511a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
@@ -11,6 +11,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
index 34903ffd954..337b583c502 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
index 34903ffd954..337b583c502 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
@@ -10,6 +10,6 @@ public open class J {
 
     // Static members
     public final var staticJ: J!
-    org.jetbrains.annotations.Nullable() public final var staticN: J!
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J?
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
index 38ac1551f4f..df4f6c14145 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
@@ -17,7 +17,7 @@ fun test() {
 }
 
 fun test1() {
-    throw <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>
+    throw <!TYPE_MISMATCH!>J.staticN<!>
 }
 
 fun test2() {
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt
index 27c21d877a9..35fa850f446 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt
@@ -12,6 +12,6 @@ public open class J {
 
     // Static members
     public final var staticJ: java.lang.Exception!
-    org.jetbrains.annotations.Nullable() public final var staticN: java.lang.Exception!
-    org.jetbrains.annotations.NotNull() public final var staticNN: java.lang.Exception!
+    org.jetbrains.annotations.Nullable() public final var staticN: java.lang.Exception?
+    org.jetbrains.annotations.NotNull() public final var staticNN: java.lang.Exception
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt
index adf9031c655..344c25b69e4 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt
@@ -18,5 +18,5 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J
 }
-- 
GitLab