diff --git a/generators/evaluate/GenerateOperationsMap.kt b/generators/evaluate/GenerateOperationsMap.kt index be54abc6bb3..2e04581183f 100644 --- a/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/evaluate/GenerateOperationsMap.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.utils.Printer import java.io.File val DEST_FILE: File = File("compiler/frontend.common/src/org/jetbrains/kotlin/resolve/constants/evaluate/OperationsMapGenerated.kt") -private val EXCLUDED_FUNCTIONS: List = listOf("rangeTo", "hashCode", "inc", "dec", "subSequence") +private val EXCLUDED_FUNCTIONS: List = listOf("rangeTo", "rangeUntil", "hashCode", "inc", "dec", "subSequence") fun main() { GeneratorsFileUtil.writeFileIfContentChanged(DEST_FILE, generate()) diff --git a/generators/interpreter/GenerateInterpreterMap.kt b/generators/interpreter/GenerateInterpreterMap.kt index 151ff3ceeb9..eb4649be44d 100644 --- a/generators/interpreter/GenerateInterpreterMap.kt +++ b/generators/interpreter/GenerateInterpreterMap.kt @@ -204,10 +204,13 @@ private fun getOperationMap(argumentsCount: Int): MutableList { return !isPrimitive && isFakeOverridden } + val excludedBinaryOperations = listOf("rangeUntil").map { Name.identifier(it) } + for (classDescriptor in allPrimitiveTypes + additionalBuiltIns + arrays) { val compileTimeFunctions = classDescriptor.unsubstitutedMemberScope.getContributedDescriptors() .filterIsInstance() .filter { !it.isFakeOverride(classDescriptor) && it.valueParameters.size + 1 == argumentsCount } + .filter { it.name !in excludedBinaryOperations } for (function in compileTimeFunctions) { operationMap.add(