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

Fix stub generation for special built-ins

Browse Source 
Do not generate stubs if there is no special bridge in the current class
- there are already Kotlin super class in hierarchy
- special bridge has the same signature as method itself

 #KT-11915 Fixed
This commit is contained in:
Denis Zharkov
2016-06-29 19:43:57 +03:00
parent c07d0d48d3
commit 5c34b27ea9
5 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt
Vendored
+1 -8
View File
@@ -27,12 +27,8 @@ public abstract class A2 {
@kotlin.Metadata
public abstract class A3 {
public method <init>(): void
public method contains(p0: java.lang.Object): boolean
public abstract method getSize(): int
public method indexOf(p0: java.lang.Object): int
public method lastIndexOf(p0: java.lang.Object): int
public final method remove(p0: int): java.lang.Object
public method remove(p0: java.lang.Object): boolean
public method removeAt(p0: int): java.lang.Object
public final method size(): int
}
@@ -43,10 +39,7 @@ public abstract class A4 {
public method contains(p0: java.lang.Object): boolean
public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean
public abstract method getSize(): int
public method indexOf(p0: java.lang.Object): int
public method lastIndexOf(p0: java.lang.Object): int
public final method remove(p0: int): java.lang.Object
public method remove(p0: java.lang.Object): boolean
public method removeAt(p0: int): java.lang.Object
public final method size(): int
}
@@ -136,4 +129,4 @@ public interface I2 {
inner class I2$DefaultImpls
public abstract method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean
public abstract method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean
}
}
compiler/testData/codegen/bytecodeListing/specialBridges/removeAtTwoSpecialBridges.txt
Vendored
-2
View File
@@ -33,7 +33,6 @@ public final class A1 {
public method <init>(): void
public final method contains(p0: java.lang.Object): boolean
public method contains(p0: java.lang.String): boolean
public method getSize(): int
public final method indexOf(p0: java.lang.Object): int
public method indexOf(p0: java.lang.String): int
public final method lastIndexOf(p0: java.lang.Object): int
@@ -52,7 +51,6 @@ public final class A2 {
public method <init>(): void
public final method contains(p0: java.lang.Object): boolean
public method contains(p0: java.lang.String): boolean
public method getSize(): int
public final method indexOf(p0: java.lang.Object): int
public method indexOf(p0: java.lang.String): int
public final method lastIndexOf(p0: java.lang.Object): int