From f1ac5796edf3d98a67d48f6bc608b6de0cd080d7 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 21 Jul 2021 19:37:16 +0200 Subject: [PATCH] Fix test data of compileJavaAgainstKotlin for 1.6 See LanguageFeature.DefinitelyNotNullTypeParameters. --- .../compileJavaAgainstKotlin/class/ImplementsMapPP.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt index 7b8d42c9e1e..318e120bc22 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt @@ -9,7 +9,7 @@ public abstract class Mine : java.util.Map { public abstract /*fake_override*/ fun clear(): kotlin.Unit public open /*fake_override*/ fun compute(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? public open /*fake_override*/ fun computeIfAbsent(/*0*/ P2, /*1*/ java.util.function.Function): P1 - public open /*fake_override*/ fun computeIfPresent(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? + public open /*fake_override*/ fun computeIfPresent(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? public abstract /*fake_override*/ fun containsKey(/*0*/ kotlin.Any!): kotlin.Boolean public abstract /*fake_override*/ fun containsValue(/*0*/ kotlin.Any!): kotlin.Boolean public abstract /*fake_override*/ fun entrySet(): kotlin.collections.(Mutable)Set!>! @@ -18,7 +18,7 @@ public abstract class Mine : java.util.Map { public open /*fake_override*/ fun getOrDefault(/*0*/ kotlin.Any!, /*1*/ P1!): P1! public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract /*fake_override*/ fun keySet(): kotlin.collections.(Mutable)Set! - public open /*fake_override*/ fun merge(/*0*/ P2, /*1*/ P1, /*2*/ java.util.function.BiFunction): P1? + public open /*fake_override*/ fun merge(/*0*/ P2, /*1*/ P1!!, /*2*/ java.util.function.BiFunction): P1? public abstract /*fake_override*/ fun put(/*0*/ P2!, /*1*/ P1!): P1! public abstract /*fake_override*/ fun putAll(/*0*/ (kotlin.collections.MutableMap..kotlin.collections.Map?)): kotlin.Unit public open /*fake_override*/ fun putIfAbsent(/*0*/ P2, /*1*/ P1): P1?