From 5fa518fd550e1f319e1dae09905bcb3371123123 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Mon, 1 Apr 2019 01:38:30 +0300
Subject: [PATCH] Revert "Temporary fix for NI to compile against bootstrap
 compiler"

 This reverts commit 791ab05e08df48fa9359b9f52f494f0198e4c340.

 Problem was fixed in 4a1b9dcc & 1ac35420
---
 .../src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt      | 2 +-
 .../kotlin/resolve/calls/results/OverloadingConflictResolver.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 0a7e2dfb152..fb17db5b4ac 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
@@ -372,7 +372,7 @@ infix fun DaemonJVMOptions.memorywiseFitsInto(other: DaemonJVMOptions): Boolean
             .all { (it.get(this).memToBytes() ?: 0) <= (it.get(other).memToBytes() ?: 0) }
 
 fun compareDaemonJVMOptionsMemory(left: DaemonJVMOptions, right: DaemonJVMOptions): Int {
-    val props = daemonJVMOptionsMemoryProps.map { Pair<Long, Long>(it.get(left).memToBytes() ?: 0, it.get(right).memToBytes() ?: 0) }
+    val props = daemonJVMOptionsMemoryProps.map { Pair(it.get(left).memToBytes() ?: 0, it.get(right).memToBytes() ?: 0) }
     return when {
         props.all { it.first == it.second } -> 0
         props.all { it.first <= it.second } -> -1
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt
index 6adf3c0c4ff..677b1e1d4d3 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt
@@ -112,7 +112,7 @@ open class OverloadingConflictResolver<C : Any>(
     fun filterOutEquivalentCalls(candidates: Collection<C>): Set<C> {
         candidates.setIfOneOrEmpty()?.let { return it }
 
-        val fromSourcesGoesFirst = candidates.sortedBy<C, Int> { if (isFromSources(it.resultingDescriptor)) 0 else 1 }
+        val fromSourcesGoesFirst = candidates.sortedBy { if (isFromSources(it.resultingDescriptor)) 0 else 1 }
 
         val result = LinkedHashSet<C>()
         outerLoop@ for (meD in fromSourcesGoesFirst) {