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

[JVM IR] Do not generate clinit as enclosing method.

Browse Source 
The JVM and newer Android runtimes treats that the same as if
there is no enclosing method. However, older Android runtimes
for Android 5 and 6 throw exceptions on reflective access
and even older runtimes have different behavior. To avoid
those issues, exclude <clinit> from enclosing method attributes.

^ KT-48754 Fixed
This commit is contained in:
Mads Ager
2021-09-30 13:11:31 +02:00
committed by Alexander Udalov
parent 56867d9c7e
commit b61389f6f9
9 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses_ir.txt
Vendored
+4 -4
View File
@@ -10,7 +10,7 @@ public final class A {
@kotlin.Metadata
synthetic final class NoReceiverInCallableReferenceClassesKt$A_bar$1 {
// source: 'noReceiverInCallableReferenceClasses.kt'
enclosing method NoReceiverInCallableReferenceClassesKt.<clinit>()V
enclosing class NoReceiverInCallableReferenceClassesKt
public final static field INSTANCE: NoReceiverInCallableReferenceClassesKt$A_bar$1
inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_bar$1
static method <clinit>(): void
@@ -21,7 +21,7 @@ synthetic final class NoReceiverInCallableReferenceClassesKt$A_bar$1 {
@kotlin.Metadata
synthetic final class NoReceiverInCallableReferenceClassesKt$A_foo$1 {
// source: 'noReceiverInCallableReferenceClasses.kt'
enclosing method NoReceiverInCallableReferenceClassesKt.<clinit>()V
enclosing class NoReceiverInCallableReferenceClassesKt
public final static field INSTANCE: NoReceiverInCallableReferenceClassesKt$A_foo$1
inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_foo$1
static method <clinit>(): void
@@ -33,7 +33,7 @@ synthetic final class NoReceiverInCallableReferenceClassesKt$A_foo$1 {
@kotlin.Metadata
synthetic final class NoReceiverInCallableReferenceClassesKt$aBar$1 {
// source: 'noReceiverInCallableReferenceClasses.kt'
enclosing method NoReceiverInCallableReferenceClassesKt.<clinit>()V
enclosing class NoReceiverInCallableReferenceClassesKt
inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aBar$1
method <init>(p0: java.lang.Object): void
public @org.jetbrains.annotations.Nullable method get(): java.lang.Object
@@ -42,7 +42,7 @@ synthetic final class NoReceiverInCallableReferenceClassesKt$aBar$1 {
@kotlin.Metadata
synthetic final class NoReceiverInCallableReferenceClassesKt$aFoo$1 {
// source: 'noReceiverInCallableReferenceClasses.kt'
enclosing method NoReceiverInCallableReferenceClassesKt.<clinit>()V
enclosing class NoReceiverInCallableReferenceClassesKt
inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aFoo$1
method <init>(p0: java.lang.Object): void
public synthetic bridge method invoke(): java.lang.Object