diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index a240f9929d7..2eae0405744 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -757,7 +757,7 @@ public class JetTypeMapper { } FunctionDescriptor overriddenSpecialBuiltinFunction = - SpecialBuiltinMembers.getOverriddenBuiltinWithDifferentJvmName(functionDescriptor.getOriginal()); + SpecialBuiltinMembers.getOverriddenBuiltinWithDifferentJvmDescriptor(functionDescriptor.getOriginal()); FunctionDescriptor functionToCall = overriddenSpecialBuiltinFunction != null ? overriddenSpecialBuiltinFunction.getOriginal() : functionDescriptor.getOriginal(); diff --git a/compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt b/compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt index d891d179dbe..4d4fb461e2e 100644 --- a/compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt +++ b/compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt @@ -106,5 +106,4 @@ fun foo( // 4 INVOKEVIRTUAL A[0-9]\.contains \(Ljava/lang/Object;\)Z // 2 INVOKEVIRTUAL A7\.contains \(I\)Z // 1 INVOKEINTERFACE java/util/Collection.contains \(Ljava/lang/Object;\)Z -// 1 INVOKEINTERFACE I1.contains \(Ljava/lang/Object;\)Z -// 1 INVOKEINTERFACE I2.contains \(Ljava/lang/String;\)Z \ No newline at end of file +// 2 INVOKEINTERFACE I[1-2].contains \(Ljava/lang/Object;\)Z