From a6b51da3081b11dc2167a0cbb8ebca6f0e805d03 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Wed, 13 Jan 2021 21:47:23 +0100
Subject: [PATCH] Fix compilation in the case of JDK_16 pointing to JDK 1.8

---
 .../jvm/src/kotlin/collections/MutableCollectionsJVM.kt       | 2 +-
 libraries/stdlib/jvm/src/kotlin/reflect/TypesJVM.kt           | 4 +++-
 libraries/stdlib/src/kotlin/comparisons/Comparisons.kt        | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt
index fd1a4ad649f..6a826cdfde5 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt
@@ -11,7 +11,7 @@ package kotlin.collections
 
 @Deprecated("Use sortWith(comparator) instead.", ReplaceWith("this.sortWith(comparator)"), level = DeprecationLevel.ERROR)
 @kotlin.internal.InlineOnly
-@Suppress("UNUSED_PARAMETER")
+@Suppress("UNUSED_PARAMETER", "EXTENSION_SHADOWED_BY_MEMBER")
 public inline fun <T> MutableList<T>.sort(comparator: Comparator<in T>): Unit = throw NotImplementedError()
 
 @Deprecated("Use sortWith(Comparator(comparison)) instead.", ReplaceWith("this.sortWith(Comparator(comparison))"), level = DeprecationLevel.ERROR)
diff --git a/libraries/stdlib/jvm/src/kotlin/reflect/TypesJVM.kt b/libraries/stdlib/jvm/src/kotlin/reflect/TypesJVM.kt
index 6419ced1609..88e631c37fa 100644
--- a/libraries/stdlib/jvm/src/kotlin/reflect/TypesJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/reflect/TypesJVM.kt
@@ -97,7 +97,9 @@ private val KTypeProjection.javaType: Type
 @ExperimentalStdlibApi
 private interface TypeImpl : Type {
     // This is a copy of [Type.getTypeName] which is present on JDK 8+.
-    @Suppress("VIRTUAL_MEMBER_HIDDEN") // This is needed for cases when environment variable JDK_16 points to JDK 8+.
+    @Suppress(
+        "VIRTUAL_MEMBER_HIDDEN", "NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT"
+    ) // This is needed for cases when environment variable JDK_16 points to JDK 8+.
     fun getTypeName(): String
 }
 
diff --git a/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt b/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt
index f862b100d77..bdbe59aac0e 100644
--- a/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt
+++ b/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt
@@ -291,6 +291,7 @@ public fun <T : Comparable<T>> reverseOrder(): Comparator<T> = @Suppress("UNCHEC
  *
  *  @sample samples.comparisons.Comparisons.reversed
  */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 public fun <T> Comparator<T>.reversed(): Comparator<T> = when (this) {
     is ReversedComparator -> this.comparator
     NaturalOrderComparator -> @Suppress("UNCHECKED_CAST") (ReverseOrderComparator as Comparator<T>)