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

Kotlin module name extraction

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-04 15:46:47 +03:00
parent 2ca9b3ae0e
commit 606b39698c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+1 -1
View File
@@ -479,7 +479,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
@NotNull GenerationState state, @NotNull GenerationState state,
@NotNull ClassBuilder classBuilder @NotNull ClassBuilder classBuilder
) { ) {
classBuilder.newField(NO_ORIGIN, ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, "$moduleName", classBuilder.newField(NO_ORIGIN, ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.KOTLIN_MODULE_FIELD_NAME,
AsmTypes.JAVA_STRING_TYPE.getDescriptor(), null, state.getModuleName()); AsmTypes.JAVA_STRING_TYPE.getDescriptor(), null, state.getModuleName());
} }
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
+1
View File
@@ -44,6 +44,7 @@ public final class JvmAbi {
public static final String KOTLIN_CLASS_FIELD_NAME = "$kotlinClass"; public static final String KOTLIN_CLASS_FIELD_NAME = "$kotlinClass";
public static final String KOTLIN_PACKAGE_FIELD_NAME = "$kotlinPackage"; public static final String KOTLIN_PACKAGE_FIELD_NAME = "$kotlinPackage";
public static final String KOTLIN_MODULE_FIELD_NAME = "$moduleName";
public static final ClassId REFLECTION_FACTORY_IMPL = ClassId.topLevel(new FqName("kotlin.reflect.jvm.internal.ReflectionFactoryImpl")); public static final ClassId REFLECTION_FACTORY_IMPL = ClassId.topLevel(new FqName("kotlin.reflect.jvm.internal.ReflectionFactoryImpl"));
@NotNull @NotNull
core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt
+2 -1
View File
@@ -16,6 +16,7 @@
package kotlin.reflect.jvm package kotlin.reflect.jvm
import org.jetbrains.kotlin.load.java.JvmAbi
import java.lang.reflect.* import java.lang.reflect.*
import java.util.* import java.util.*
import kotlin.reflect.* import kotlin.reflect.*
@@ -96,7 +97,7 @@ public val KType.javaType: Type
public val Class<*>.kotlinPackage: KPackage? public val Class<*>.kotlinPackage: KPackage?
get() = if (getSimpleName().endsWith("Package") && get() = if (getSimpleName().endsWith("Package") &&
getAnnotation(javaClass<kotlin.jvm.internal.KotlinPackage>()) != null) { getAnnotation(javaClass<kotlin.jvm.internal.KotlinPackage>()) != null) {
val field = this.getField("\$moduleName") val field = this.getField(JvmAbi.KOTLIN_MODULE_FIELD_NAME)
if (field != null) { if (field != null) {
KPackageImpl(this, field.get(null) as String) KPackageImpl(this, field.get(null) as String)
} else { } else {