From d25f9dee62eb04a7875dc7820cbb302f0193aa80 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Tue, 26 May 2020 14:51:56 +0200
Subject: [PATCH] Minor, remove temporary workarounds for JPS build

---
 .../src/kotlin/reflect/jvm/internal/KClassImpl.kt  |  1 -
 .../reflect/jvm/internal/KTypeParameterImpl.kt     | 14 ++------------
 .../jvm/internal/ReflectionFactoryImpl.java        |  5 ++---
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
index 2e8a97c9c15..85f97b69323 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
@@ -279,7 +279,6 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
     override val isCompanion: Boolean
         get() = descriptor.isCompanionObject
 
-    @Suppress("NOTHING_TO_OVERRIDE") // Temporary workaround for the JPS build until bootstrap
     override val isFun: Boolean
         get() = descriptor.isFun
 
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeParameterImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeParameterImpl.kt
index 56460e1519c..9331aed8c8f 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeParameterImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeParameterImpl.kt
@@ -18,6 +18,7 @@ package kotlin.reflect.jvm.internal
 
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.types.Variance
+import kotlin.jvm.internal.TypeParameterReference
 import kotlin.reflect.KType
 import kotlin.reflect.KTypeParameter
 import kotlin.reflect.KVariance
@@ -50,17 +51,6 @@ internal class KTypeParameterImpl(override val descriptor: TypeParameterDescript
     override fun hashCode() =
         descriptor.hashCode()
 
-    // TODO: this temporarily duplicates TypeParameterReference.toString to prevent JPS build failure until stdlib is bootstrapped
     override fun toString() =
-        // TypeParameterReference.toString(this)
-        buildString {
-            when (variance) {
-                KVariance.INVARIANT -> {
-                }
-                KVariance.IN -> append("in ")
-                KVariance.OUT -> append("out ")
-            }
-
-            append(name)
-        }
+        TypeParameterReference.toString(this)
 }
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java
index 7eede5b00f1..d36537f53e1 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java
@@ -123,8 +123,7 @@ public class ReflectionFactoryImpl extends ReflectionFactory {
         return KClassifiers.createType(klass, arguments, isMarkedNullable, Collections.<Annotation>emptyList());
     }
 
-    // TODO: this is a temporary workaround for the JPS build
-    // @Override
+    @Override
     public KTypeParameter typeParameter(Object container, String name, KVariance variance, boolean isReified) {
         List<KTypeParameter> typeParameters;
         if (container instanceof KClass) {
@@ -140,7 +139,7 @@ public class ReflectionFactoryImpl extends ReflectionFactory {
         throw new IllegalArgumentException("Type parameter " + name + " is not found in container: " + container);
     }
 
-    // @Override
+    @Override
     public void setUpperBounds(KTypeParameter typeParameter, List<KType> bounds) {
         // Do nothing. KTypeParameterImpl implementation will load upper bounds from the metadata.
     }