[JVM IR] Do not generate clinit as enclosing method.
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:
committed by
Alexander Udalov
parent
56867d9c7e
commit
b61389f6f9
+1
-1
@@ -43,7 +43,7 @@ public final class H1 {
|
||||
@kotlin.Metadata
|
||||
final class H2$Companion$property$2 {
|
||||
// source: 'delegatedPropertiesInCompanionObject.kt'
|
||||
enclosing method H2.<clinit>()V
|
||||
enclosing class H2
|
||||
public final static field INSTANCE: H2$Companion$property$2
|
||||
inner (anonymous) class H2$Companion$property$2
|
||||
static method <clinit>(): void
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
@kotlin.Metadata
|
||||
final class FileClassWithPrivateDeclarationsOnly_afterKt$b$2 {
|
||||
// source: 'fileClassWithPrivateDeclarationsOnly_after.kt'
|
||||
enclosing method FileClassWithPrivateDeclarationsOnly_afterKt.<clinit>()V
|
||||
enclosing class FileClassWithPrivateDeclarationsOnly_afterKt
|
||||
public final static field INSTANCE: FileClassWithPrivateDeclarationsOnly_afterKt$b$2
|
||||
inner (anonymous) class FileClassWithPrivateDeclarationsOnly_afterKt$b$2
|
||||
static method <clinit>(): void
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
@kotlin.Metadata
|
||||
final class FileClassWithPrivateDeclarationsOnly_beforeKt$b$2 {
|
||||
// source: 'fileClassWithPrivateDeclarationsOnly_before.kt'
|
||||
enclosing method FileClassWithPrivateDeclarationsOnly_beforeKt.<clinit>()V
|
||||
enclosing class FileClassWithPrivateDeclarationsOnly_beforeKt
|
||||
public final static field INSTANCE: FileClassWithPrivateDeclarationsOnly_beforeKt$b$2
|
||||
inner (anonymous) class FileClassWithPrivateDeclarationsOnly_beforeKt$b$2
|
||||
static method <clinit>(): void
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user