From 733f3e80256321e0d89ec52009e353bf1ed65ce7 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 29 Apr 2016 15:09:06 +0300
Subject: [PATCH] Code cleanup: type parameters can have in / out variance

---
 .../kotlin/backend/common/bridges/bridges.kt  |  2 +-
 .../kotlin/codegen/builtinSpecialBridges.kt   |  2 +-
 .../codegen/inline/ObjectTransformer.kt       |  2 +-
 .../codegen/inline/TryBlockClustering.kt      |  2 +-
 .../cli/jvm/compiler/JvmDependenciesIndex.kt  |  2 +-
 .../kotlin/daemon/common/CompileService.kt    |  2 +-
 .../kotlin/daemon/common/DaemonParams.kt      | 46 +++++++++----------
 .../kotlin/cfg/PseudocodeTraverser.kt         |  2 +-
 .../InstructionVisitorWithResult.kt           |  2 +-
 .../kotlin/diagnostics/PositioningStrategy.kt |  2 +-
 .../diagnostics/rendering/RenderingContext.kt |  2 +-
 .../kotlin/resolve/DelegationResolver.kt      |  2 +-
 ...nExpansiveInheritanceRestrictionChecker.kt |  2 +-
 .../evaluate/ConstantExpressionEvaluator.kt   |  4 +-
 .../kotlin/resolve/importedFromObject.kt      |  4 +-
 .../descriptors/AbstractLazyMemberScope.kt    |  2 +-
 .../lazy/descriptors/LazyClassMemberScope.kt  |  2 +-
 .../kotlin/util/MappedExtensionProvider.kt    |  2 +-
 .../kotlin/asJava/KtLightElements.kt          |  4 +-
 .../calls/tower/ScopeTowerProcessors.kt       |  4 +-
 .../resolve/calls/tower/TowerResolver.kt      |  2 +-
 .../kotlin/resolve/calls/tower/TowerUtils.kt  |  2 +-
 .../kotlin/utils/CachedValueProperty.kt       |  2 +-
 .../org/jetbrains/kotlin/utils/concurrent.kt  |  2 +-
 .../java/typeEnhancement/typeEnhancement.kt   |  2 +-
 ...tBinaryClassAnnotationAndConstantLoader.kt |  2 +-
 .../kotlin/builtins/BuiltInsInitializer.kt    |  2 +-
 .../resolve/constants/constantValues.kt       |  2 +-
 .../kotlin/types/CapturedTypeApproximation.kt |  2 +-
 .../AnnotationAndConstantLoader.kt            |  2 +-
 .../org/jetbrains/kotlin/storage/storage.kt   |  8 ++--
 eval4j/src/org/jetbrains/eval4j/values.kt     |  2 +-
 .../jetbrains/kotlin/idea/util/CallType.kt    |  2 +-
 .../psi/patternMatching/KotlinPsiUnifier.kt   |  2 +-
 .../idea/caches/FileAttributeService.kt       |  2 +-
 .../kotlin/idea/caches/resolve/cacheUtils.kt  |  2 +-
 .../decompiler/textBuilder/DecompiledText.kt  |  2 +-
 .../kotlin/idea/core/ShortenReferences.kt     |  2 +-
 .../ConfigureKotlinNotificationManager.kt     |  2 +-
 .../idea/quickfix/KotlinQuickFixAction.kt     |  2 +-
 .../CreateParameterFromUsageFactory.kt        |  2 +-
 .../idea/refactoring/CallableRefactoring.kt   |  2 +-
 .../org/jetbrains/kotlin/j2k/TypeConverter.kt |  2 +-
 .../js/inline/clean/ReferenceTracker.kt       |  2 +-
 .../callTranslator/CallTranslator.kt          |  4 +-
 45 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt
index dbeec69c710..4de90a130fd 100644
--- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt
@@ -26,7 +26,7 @@ interface FunctionHandle {
     fun getOverridden(): Iterable<FunctionHandle>
 }
 
-data class Bridge<Signature>(
+data class Bridge<out Signature>(
         val from: Signature,
         val to: Signature
 ) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt
index bac74c3287f..5f47fa5f6d4 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.kotlin.utils.singletonOrEmptyList
 import java.util.*
 
-class BridgeForBuiltinSpecial<Signature : Any>(
+class BridgeForBuiltinSpecial<out Signature : Any>(
         val from: Signature, val to: Signature,
         val isSpecial: Boolean = false,
         val isDelegateToSuper: Boolean = false
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ObjectTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ObjectTransformer.kt
index 11f0db025e9..9a41840c122 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ObjectTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ObjectTransformer.kt
@@ -26,7 +26,7 @@ import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode
 import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
 
-abstract class ObjectTransformer<T : TransformationInfo>(@JvmField val transformationInfo: T, val state: GenerationState) {
+abstract class ObjectTransformer<out T : TransformationInfo>(@JvmField val transformationInfo: T, val state: GenerationState) {
 
     abstract fun doTransform(parentRemapper: FieldRemapper): InlineResult
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt
index 9df968012d4..4373f15e0f7 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt
@@ -26,7 +26,7 @@ enum class TryCatchPosition {
     INNER
 }
 
-class SplitPair<T: Interval>(val patchedPart: T, val newPart: T)
+class SplitPair<out T: Interval>(val patchedPart: T, val newPart: T)
 
 class SimpleInterval(override val startLabel: LabelNode, override val endLabel: LabelNode ) : Interval
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt
index c59eb924f98..c8eb73e0a00 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt
@@ -115,7 +115,7 @@ class JvmDependenciesIndex(_roots: List<JavaRoot>) {
         return result
     }
 
-    private data class HandleResult<T : Any>(val result: T?, val continueSearch: Boolean)
+    private data class HandleResult<out T : Any>(val result: T?, val continueSearch: Boolean)
 
     private fun <T : Any> search(
             request: SearchRequest,
diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
index 35ece05d3fc..6e91ce9c681 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
@@ -38,7 +38,7 @@ interface CompileService : Remote {
 
     sealed class CallResult<out R> : Serializable {
 
-        class Good<R>(val result: R) : CallResult<R>() {
+        class Good<out R>(val result: R) : CallResult<R>() {
             override fun get(): R = result
             override fun equals(other: Any?): Boolean = other is Good<*> && this.result == other.result
             override fun hashCode(): Int = this.javaClass.hashCode() + (result?.hashCode() ?: 1)
diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
index eacc3174e4f..e6aeb7c0a41 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
@@ -55,13 +55,13 @@ val COMPILE_DAEMON_DEFAULT_RUN_DIR_PATH: String get() =
 val CLASSPATH_ID_DIGEST = "MD5"
 
 
-open class PropMapper<C, V, P : KMutableProperty1<C, V>>(val dest: C,
-                                                         val prop: P,
-                                                         val names: List<String> = listOf(prop.name),
-                                                         val fromString: (String) -> V,
-                                                         val toString: ((V) -> String?) = { it.toString() },
-                                                         val skipIf: ((V) -> Boolean) = { false },
-                                                         val mergeDelimiter: String? = null) {
+open class PropMapper<C, V, out P : KMutableProperty1<C, V>>(val dest: C,
+                                                             val prop: P,
+                                                             val names: List<String> = listOf(prop.name),
+                                                             val fromString: (String) -> V,
+                                                             val toString: ((V) -> String?) = { it.toString() },
+                                                             val skipIf: ((V) -> Boolean) = { false },
+                                                             val mergeDelimiter: String? = null) {
     open fun toArgs(prefix: String = COMPILE_DAEMON_CMDLINE_OPTIONS_PREFIX): List<String> =
             when {
                 skipIf(prop.get(dest)) -> listOf<String>()
@@ -73,34 +73,34 @@ open class PropMapper<C, V, P : KMutableProperty1<C, V>>(val dest: C,
 }
 
 
-class NullablePropMapper<C, V : Any?, P : KMutableProperty1<C, V>>(dest: C,
-                                                                   prop: P,
-                                                                   names: List<String> = listOf(),
-                                                                   fromString: ((String) -> V),
-                                                                   toString: ((V) -> String?) = { it.toString() },
-                                                                   skipIf: ((V) -> Boolean) = { it == null },
-                                                                   mergeDelimiter: String? = null)
+class NullablePropMapper<C, V : Any?, out P : KMutableProperty1<C, V>>(dest: C,
+                                                                       prop: P,
+                                                                       names: List<String> = listOf(),
+                                                                       fromString: ((String) -> V),
+                                                                       toString: ((V) -> String?) = { it.toString() },
+                                                                       skipIf: ((V) -> Boolean) = { it == null },
+                                                                       mergeDelimiter: String? = null)
 : PropMapper<C, V, P>(dest = dest, prop = prop, names = if (names.any()) names else listOf(prop.name),
                       fromString = fromString, toString = toString, skipIf = skipIf, mergeDelimiter = mergeDelimiter)
 
 
-class StringPropMapper<C, P : KMutableProperty1<C, String>>(dest: C,
-                                                            prop: P,
-                                                            names: List<String> = listOf(),
-                                                            fromString: ((String) -> String) = { it },
-                                                            toString: ((String) -> String?) = { it.toString() },
-                                                            skipIf: ((String) -> Boolean) = { it.isEmpty() },
-                                                            mergeDelimiter: String? = null)
+class StringPropMapper<C, out P : KMutableProperty1<C, String>>(dest: C,
+                                                                prop: P,
+                                                                names: List<String> = listOf(),
+                                                                fromString: ((String) -> String) = { it },
+                                                                toString: ((String) -> String?) = { it.toString() },
+                                                                skipIf: ((String) -> Boolean) = { it.isEmpty() },
+                                                                mergeDelimiter: String? = null)
 : PropMapper<C, String, P>(dest = dest, prop = prop, names = if (names.any()) names else listOf(prop.name),
                            fromString = fromString, toString = toString, skipIf = skipIf, mergeDelimiter = mergeDelimiter)
 
 
-class BoolPropMapper<C, P : KMutableProperty1<C, Boolean>>(dest: C, prop: P, names: List<String> = listOf())
+class BoolPropMapper<C, out P : KMutableProperty1<C, Boolean>>(dest: C, prop: P, names: List<String> = listOf())
 : PropMapper<C, Boolean, P>(dest = dest, prop = prop, names = if (names.any()) names else listOf(prop.name),
                             fromString = { true }, toString = { null }, skipIf = { !prop.get(dest) })
 
 
-class RestPropMapper<C, P : KMutableProperty1<C, MutableCollection<String>>>(dest: C, prop: P)
+class RestPropMapper<C, out P : KMutableProperty1<C, MutableCollection<String>>>(dest: C, prop: P)
 : PropMapper<C, MutableCollection<String>, P>(dest = dest, prop = prop, toString = { null }, fromString = { arrayListOf() }) {
     override fun toArgs(prefix: String): List<String> = prop.get(dest).map { prefix + it }
     override fun apply(s: String) = add(s)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeTraverser.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeTraverser.kt
index 3768943a602..5090dbaf0c5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeTraverser.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeTraverser.kt
@@ -170,7 +170,7 @@ private fun <I : ControlFlowInfo<*>> updateEdgeDataForInstruction(
     }
 }
 
-data class Edges<T>(val incoming: T, val outgoing: T)
+data class Edges<out T>(val incoming: T, val outgoing: T)
 
 enum class TraverseInstructionResult {
     CONTINUE,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt
index ca834819184..de52d51b331 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*
 import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*
 import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*
 
-abstract class InstructionVisitorWithResult<R>() {
+abstract class InstructionVisitorWithResult<out R>() {
     abstract fun visitInstruction(instruction: Instruction): R
 
     open fun visitAccessInstruction(instruction: AccessValueInstruction): R {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategy.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategy.kt
index e1023f0d978..127d1136036 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategy.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategy.kt
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-open class PositioningStrategy<E : PsiElement> {
+open class PositioningStrategy<in E : PsiElement> {
     open fun markDiagnostic(diagnostic: ParametrizedDiagnostic<out E>): List<TextRange> {
         return mark(diagnostic.psiElement)
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/RenderingContext.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/RenderingContext.kt
index 0c2c56b5e25..b05ea75c763 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/RenderingContext.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/RenderingContext.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.diagnostics.*
 sealed class RenderingContext {
     abstract operator fun <T> get(key: Key<T>): T
 
-    abstract class Key<T>(val name: String) {
+    abstract class Key<out T>(val name: String) {
         abstract fun compute(objectsToRender: Collection<Any?>): T
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt
index eefc6685182..105741e027f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt
@@ -88,7 +88,7 @@ class DelegationResolver<T : CallableMemberDescriptor> private constructor(
         }
     }
 
-    interface MemberExtractor<T : CallableMemberDescriptor> {
+    interface MemberExtractor<out T : CallableMemberDescriptor> {
         fun getMembersByType(type: KotlinType): Collection<T>
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/NonExpansiveInheritanceRestrictionChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/NonExpansiveInheritanceRestrictionChecker.kt
index 45d5ea26160..ec1d4435e38 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/NonExpansiveInheritanceRestrictionChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/NonExpansiveInheritanceRestrictionChecker.kt
@@ -136,7 +136,7 @@ object NonExpansiveInheritanceRestrictionChecker {
         }
     }
 
-    private data class ExpansiveEdge<T>(val from: T, val to: T)
+    private data class ExpansiveEdge<out T>(val from: T, val to: T)
 
     private interface  Graph<T> {
         fun getNeighbors(node: T): Collection<T>
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
index c0b20a69c13..2c94e8958dc 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
@@ -896,8 +896,8 @@ internal fun <A> unaryOperation(
         checker: Function1<Long, Long>
 ) = UnaryOperationKey(a, functionName) to Pair(operation, checker) as Pair<Function1<Any?, Any>, Function1<Long, Long>>
 
-internal data class BinaryOperationKey<A, B>(val f: CompileTimeType<out A>, val s: CompileTimeType<out B>, val functionName: String)
-internal data class UnaryOperationKey<A>(val f: CompileTimeType<out A>, val functionName: String)
+internal data class BinaryOperationKey<out A, out B>(val f: CompileTimeType<out A>, val s: CompileTimeType<out B>, val functionName: String)
+internal data class UnaryOperationKey<out A>(val f: CompileTimeType<out A>, val functionName: String)
 
 fun ConstantValue<*>.isStandaloneOnlyConstant(): Boolean {
     return this is KClassValue || this is EnumValue || this is AnnotationValue || this is ArrayValue
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt
index ba3dbdf9f50..b77e897da27 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt
@@ -19,7 +19,9 @@ package org.jetbrains.kotlin.resolve
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.types.TypeSubstitutor
 
-abstract class ImportedFromObjectCallableDescriptor<TCallable : CallableDescriptor>(val callableFromObject: TCallable) : CallableDescriptor {
+abstract class ImportedFromObjectCallableDescriptor<out TCallable : CallableDescriptor>(
+        val callableFromObject: TCallable
+) : CallableDescriptor {
     val containingObject = callableFromObject.containingDeclaration as ClassDescriptor
 }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
index 76fee0d62a5..41213bd0442 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import java.util.*
 
-abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : DeclarationProvider>
+abstract class AbstractLazyMemberScope<out D : DeclarationDescriptor, out DP : DeclarationProvider>
 protected constructor(
         protected val c: LazyClassContext,
         protected val declarationProvider: DP,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
index 8dc98033df7..0518c915b5a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
@@ -86,7 +86,7 @@ open class LazyClassMemberScope(
         return result
     }
 
-    private interface MemberExtractor<T : CallableMemberDescriptor> {
+    private interface MemberExtractor<out T : CallableMemberDescriptor> {
         fun extract(extractFrom: KotlinType, name: Name): Collection<T>
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt
index a9b53305010..ea2c3d9cf08 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt
@@ -21,7 +21,7 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.extensions.ExtensionPointName
 import java.lang.ref.WeakReference
 
-open class MappedExtensionProvider<T, R>
+open class MappedExtensionProvider<T, out R>
 protected constructor(
         private val epName: ExtensionPointName<T>,
         private val map: (List<T>) -> R
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElements.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElements.kt
index 9957db0d876..a24d1042062 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElements.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElements.kt
@@ -21,10 +21,10 @@ import com.intellij.psi.PsiNamedElement
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtElement
 
-interface KtLightElement<T : KtElement, D : PsiElement> : PsiNamedElement {
+interface KtLightElement<out T : KtElement, out D : PsiElement> : PsiNamedElement {
     val kotlinOrigin: T?
 
     val clsDelegate: D
 }
 
-interface KtLightDeclaration<T: KtDeclaration, D: PsiElement>: KtLightElement<T, D>
\ No newline at end of file
+interface KtLightDeclaration<out T: KtDeclaration, out D: PsiElement>: KtLightElement<T, D>
\ No newline at end of file
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt
index 9c82c7d9a26..7e325ea259e 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt
@@ -27,14 +27,14 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.utils.addToStdlib.check
 
 
-class KnownResultProcessor<C>(
+class KnownResultProcessor<out C>(
         val result: Collection<C>
 ): ScopeTowerProcessor<C> {
     override fun process(data: TowerData)
             = if (data == TowerData.Empty) listOfNotNull(result.check { it.isNotEmpty() }) else emptyList()
 }
 
-class CompositeScopeTowerProcessor<C>(
+class CompositeScopeTowerProcessor<out C>(
         vararg val processors: ScopeTowerProcessor<C>
 ) : ScopeTowerProcessor<C> {
     override fun process(data: TowerData): List<Collection<C>> = processors.flatMap { it.process(data) }
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
index 28a5cb9fc03..42b5f4878e0 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
@@ -38,7 +38,7 @@ interface Candidate<out D : CallableDescriptor> {
     val status: ResolutionCandidateStatus
 }
 
-interface TowerContext<D : CallableDescriptor, C: Candidate<D>> {
+interface TowerContext<D : CallableDescriptor, out C: Candidate<D>> {
     val name: Name
     val scopeTower: ScopeTower
 
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerUtils.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerUtils.kt
index 9fd1ede5a87..fce3fb12e0e 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerUtils.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerUtils.kt
@@ -31,7 +31,7 @@ val CandidateWithBoundDispatchReceiver<*>.requiresExtensionReceiver: Boolean
 
 fun DataFlowDecorator.getAllPossibleTypes(receiver: ReceiverValue) = getSmartCastTypes(receiver) + receiver.type
 
-internal class CandidateWithBoundDispatchReceiverImpl<D : CallableDescriptor>(
+internal class CandidateWithBoundDispatchReceiverImpl<out D : CallableDescriptor>(
         override val dispatchReceiver: ReceiverValue?,
         override val descriptor: D,
         override val diagnostics: List<ResolutionDiagnostic>
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/CachedValueProperty.kt b/compiler/util/src/org/jetbrains/kotlin/utils/CachedValueProperty.kt
index 78cff3fc1b5..fe6f4517854 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/CachedValueProperty.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/CachedValueProperty.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.utils
 
 import kotlin.reflect.KProperty
 
-class CachedValueProperty<TValue : Any, TTimestamp : Any>(
+class CachedValueProperty<out TValue : Any, TTimestamp : Any>(
         private val calculator: () -> TValue,
         private val timestampCalculator: () -> TTimestamp
 ) {
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt b/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt
index 53672809d5e..7205ba99cdb 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.utils.concurrent.block
 
-class LockedClearableLazyValue<T: Any>(val lock: Any, val init: () -> T) {
+class LockedClearableLazyValue<out T: Any>(val lock: Any, val init: () -> T) {
     @Volatile private var value: T? = null
 
     fun get(): T {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt
index 973b1b9797a..f9666694eef 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt
@@ -152,7 +152,7 @@ private fun List<Annotations>.compositeAnnotationsOrSingle() = when (size) {
 
 private fun TypeComponentPosition.shouldEnhance() = this != TypeComponentPosition.INFLEXIBLE
 
-private data class EnhancementResult<T>(val result: T, val enhancementAnnotations: Annotations?)
+private data class EnhancementResult<out T>(val result: T, val enhancementAnnotations: Annotations?)
 private fun <T> T.noChange() = EnhancementResult(this, null)
 private fun <T> T.enhancedNullability() = EnhancementResult(this, ENHANCED_NULLABILITY_ANNOTATIONS)
 private fun <T> T.enhancedMutability() = EnhancementResult(this, ENHANCED_MUTABILITY_ANNOTATIONS)
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
index c949c4cb35c..83adf5595f3 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
@@ -347,7 +347,7 @@ abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C : Any,
         }
     }
 
-    private class Storage<A, C>(
+    private class Storage<out A, out C>(
             val memberAnnotations: Map<MemberSignature, List<A>>,
             val propertyConstants: Map<MemberSignature, C>
     )
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt
index ed277c48568..3735d9da188 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.builtins
 
 import org.jetbrains.kotlin.utils.sure
 
-class BuiltInsInitializer<T : KotlinBuiltIns>(
+class BuiltInsInitializer<out T : KotlinBuiltIns>(
         private val constructor: () -> T
 ) {
     @Volatile private var instance: T? = null
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt
index 1f9ee124bf6..480b2d0a8b5 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt
@@ -33,7 +33,7 @@ abstract class ConstantValue<out T>(open val value: T) {
     override fun toString() = value.toString()
 }
 
-abstract class IntegerValueConstant<T> protected constructor(value: T) : ConstantValue<T>(value)
+abstract class IntegerValueConstant<out T> protected constructor(value: T) : ConstantValue<T>(value)
 
 class AnnotationValue(value: AnnotationDescriptor) : ConstantValue<AnnotationDescriptor>(value) {
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt b/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt
index 4ee600d8cb6..835424aad92 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 import org.jetbrains.kotlin.types.typeUtil.builtIns
 import java.util.*
 
-data class ApproximationBounds<T>(
+data class ApproximationBounds<out T>(
         val lower: T,
         val upper: T
 )
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.kt
index f8c5c237fb7..5a99b333713 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.types.KotlinType
 
 // The MessageLite instance everywhere should be Constructor, Function or Property
 // TODO: simplify this interface
-interface AnnotationAndConstantLoader<A : Any, C : Any, T : Any> {
+interface AnnotationAndConstantLoader<out A : Any, out C : Any, out T : Any> {
     fun loadClassAnnotations(
             container: ProtoContainer.Class
     ): List<A>
diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt b/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt
index 596b14e22d6..a7762896037 100644
--- a/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt
+++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt
@@ -18,20 +18,20 @@ package org.jetbrains.kotlin.storage
 
 import kotlin.reflect.KProperty
 
-interface MemoizedFunctionToNotNull<P, R : Any> : Function1<P, R> {
+interface MemoizedFunctionToNotNull<in P, out R : Any> : Function1<P, R> {
     fun isComputed(key: P): Boolean
 }
 
-interface MemoizedFunctionToNullable<P, R : Any> : Function1<P, R?> {
+interface MemoizedFunctionToNullable<in P, out R : Any> : Function1<P, R?> {
     fun isComputed(key: P): Boolean
 }
 
-interface NotNullLazyValue<T : Any> : Function0<T> {
+interface NotNullLazyValue<out T : Any> : Function0<T> {
     fun isComputed(): Boolean
     fun isComputing(): Boolean
 }
 
-interface NullableLazyValue<T : Any> : Function0<T?> {
+interface NullableLazyValue<out T : Any> : Function0<T?> {
     fun isComputed(): Boolean
     fun isComputing(): Boolean
 }
diff --git a/eval4j/src/org/jetbrains/eval4j/values.kt b/eval4j/src/org/jetbrains/eval4j/values.kt
index 5536760572f..fdc776ceef2 100644
--- a/eval4j/src/org/jetbrains/eval4j/values.kt
+++ b/eval4j/src/org/jetbrains/eval4j/values.kt
@@ -53,7 +53,7 @@ class NotInitialized(override val asmType: Type): Value {
     override fun toString() = "NotInitialized: $asmType"
 }
 
-abstract class AbstractValueBase<V>(
+abstract class AbstractValueBase<out V>(
         override val asmType: Type
 ) : Value {
     override val valid = true
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
index 6d7c3c281a5..89802183b5b 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
@@ -108,7 +108,7 @@ sealed class CallType<TReceiver : KtElement?>(val descriptorKindFilter: Descript
     }
 }
 
-sealed class CallTypeAndReceiver<TReceiver : KtElement?, TCallType : CallType<TReceiver>>(
+sealed class CallTypeAndReceiver<TReceiver : KtElement?, out TCallType : CallType<TReceiver>>(
         val callType: TCallType,
         val receiver: TReceiver
 ) {
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
index aa78224989f..9c5362e2f63 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
@@ -544,7 +544,7 @@ class KotlinPsiUnifier(
                 decl2: KtClassOrObject,
                 desc1: ClassDescriptor,
                 desc2: ClassDescriptor): Status? {
-            class OrderInfo<T>(
+            class OrderInfo<out T>(
                     val orderSensitive: List<T>,
                     val orderInsensitive: List<T>
             )
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/FileAttributeService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/FileAttributeService.kt
index 81ccddf453f..0ef4c383742 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/FileAttributeService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/FileAttributeService.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.caches
 
 import com.intellij.openapi.vfs.VirtualFile
 
-data class CachedAttributeData<T>(val value: T, val timeStamp: Long)
+data class CachedAttributeData<out T>(val value: T, val timeStamp: Long)
 
 interface FileAttributeService {
     fun register(id: String, version: Int) {}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/cacheUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/cacheUtils.kt
index b05188a3f74..99f918a5f94 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/cacheUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/cacheUtils.kt
@@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.CachedValueProvider
 
-class SynchronizedCachedValue<V>(project: Project, provider: () -> CachedValueProvider.Result<V>, trackValue: Boolean = true) {
+class SynchronizedCachedValue<out V>(project: Project, provider: () -> CachedValueProvider.Result<V>, trackValue: Boolean = true) {
     private val cachedValue = CachedValuesManager.getManager(project).createCachedValue(
             provider,
             trackValue
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledText.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledText.kt
index fa628724d32..e3452ba32ad 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledText.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledText.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.utils.keysToMap
 
 data class DecompiledText(val text: String, val index: DecompiledTextIndex)
 
-interface DecompiledTextIndexer<T: Any> {
+interface DecompiledTextIndexer<out T: Any> {
     fun indexDescriptor(descriptor: DeclarationDescriptor): Collection<T>
 }
 
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
index eecd68030d3..c0045ca6d23 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
@@ -197,7 +197,7 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
         return visitor.getDescriptorsToImport()
     }
 
-    private abstract class ShorteningVisitor<T : KtElement>(
+    private abstract class ShorteningVisitor<in T : KtElement>(
             protected val file: KtFile,
             protected val elementFilter: (PsiElement) -> FilterResult,
             protected val failedToImportDescriptors: Set<DeclarationDescriptor>
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt
index 74561918745..8dafb75dea8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt
@@ -28,7 +28,7 @@ object ConfigureKotlinNotificationManager: KotlinSingleNotificationManager<Confi
     }
 }
 
-interface KotlinSingleNotificationManager<T: Notification> {
+interface KotlinSingleNotificationManager<in T: Notification> {
     fun notify(project: Project, notification: T) {
         val notificationsManager = NotificationsManager.getNotificationsManager() ?: return
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt
index dd185895fbc..9fe851eba65 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.psi.KtCodeFragment
 import org.jetbrains.kotlin.psi.KtFile
 
-abstract class KotlinQuickFixAction<T : PsiElement>(protected val element: T) : IntentionAction {
+abstract class KotlinQuickFixAction<out T : PsiElement>(protected val element: T) : IntentionAction {
 
     override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
         return element.isValid &&
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt
index 69e064f62aa..272cb501820 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFactory.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.resolve.BindingContext
 
-data class CreateParameterData<E : KtElement>(
+data class CreateParameterData<out E : KtElement>(
         val context: BindingContext,
         val parameterInfo: KotlinParameterInfo,
         val originalExpression: E
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
index e2853912059..39ba65d5c81 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
@@ -46,7 +46,7 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope
 import java.util.*
 
-abstract class CallableRefactoring<T: CallableDescriptor>(
+abstract class CallableRefactoring<out T: CallableDescriptor>(
         val project: Project,
         val callableDescriptor: T,
         val commandName: String) {
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
index d4a841fad14..6b48e300843 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
@@ -104,7 +104,7 @@ class TypeConverter(val converter: Converter) {
         }
     }
 
-    private abstract inner class TypeFlavor<T>(val default: T) {
+    private abstract inner class TypeFlavor<out T>(val default: T) {
         private val cache = HashMap<PsiElement, T>()
         private val typesBeingCalculated = HashSet<PsiElement>()
 
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt
index a1c6c043aa0..0ca921713a8 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt
@@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.JsNode
 import org.jetbrains.kotlin.js.inline.util.IdentitySet
 import java.util.*
 
-internal class ReferenceTracker<Reference, RemoveCandidate : JsNode> {
+internal class ReferenceTracker<in Reference, RemoveCandidate : JsNode> {
     private val reachable = IdentityHashMap<Reference, Boolean>()
     private val removableCandidates = IdentityHashMap<Reference, RemoveCandidate>()
     private val referenceFromTo = IdentityHashMap<Reference, MutableSet<Reference>>()
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt
index 9661f561f0c..a8837c1e578 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt
@@ -153,7 +153,7 @@ fun computeExplicitReceiversForInvoke(
     }
 }
 
-abstract class CallCase<I : CallInfo> {
+abstract class CallCase<in I : CallInfo> {
 
     protected open fun I.unsupported(message: String = "") : Nothing = throw IllegalStateException("this case unsupported. $this")
 
@@ -186,7 +186,7 @@ abstract class FunctionCallCase : CallCase<FunctionCallInfo>()
 
 abstract class VariableAccessCase : CallCase<VariableAccessInfo>()
 
-interface DelegateIntrinsic<I : CallInfo> {
+interface DelegateIntrinsic<in I : CallInfo> {
     fun I.canBeApply(): Boolean = true
     fun I.getDescriptor(): CallableDescriptor
     fun I.getArgs(): List<JsExpression>