azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate INVOKEVIRTUAL 'contains(Object)' instead of 'contains(String)'

Browse Source 
In cases when callee overrides Collection<String>.contains
This commit is contained in:
Denis Zharkov
2015-10-15 21:06:03 +03:00
parent 64da399b31
commit 495780f5ab
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
+1 -1
View File
@@ -757,7 +757,7 @@ public class JetTypeMapper {
}
FunctionDescriptor overriddenSpecialBuiltinFunction =
SpecialBuiltinMembers.<FunctionDescriptor>getOverriddenBuiltinWithDifferentJvmName(functionDescriptor.getOriginal());
SpecialBuiltinMembers.<FunctionDescriptor>getOverriddenBuiltinWithDifferentJvmDescriptor(functionDescriptor.getOriginal());
FunctionDescriptor functionToCall = overriddenSpecialBuiltinFunction != null
? overriddenSpecialBuiltinFunction.getOriginal()
: functionDescriptor.getOriginal();
compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt
Vendored
+1 -2
View File
@@ -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
// 2 INVOKEINTERFACE I[1-2].contains \(Ljava/lang/Object;\)Z