From 606b39698c905ea4bdc44a6c44cd4cba86c0bd94 Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 4 Sep 2015 15:46:47 +0300
Subject: [PATCH] Kotlin module name extraction

---
 .../src/org/jetbrains/kotlin/codegen/MemberCodegen.java        | 2 +-
 .../src/org/jetbrains/kotlin/load/java/JvmAbi.java             | 1 +
 core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt          | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index b9275f1ebc5..dc905faa47b 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -479,7 +479,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
             @NotNull GenerationState state,
             @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());
     }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
index b0afee8d1dc..45ea69f2480 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
@@ -44,6 +44,7 @@ public final class JvmAbi {
 
     public static final String KOTLIN_CLASS_FIELD_NAME = "$kotlinClass";
     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"));
 
     @NotNull
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt
index 3a5d55a2dfe..9e518222f5b 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt
@@ -16,6 +16,7 @@
 
 package kotlin.reflect.jvm
 
+import org.jetbrains.kotlin.load.java.JvmAbi
 import java.lang.reflect.*
 import java.util.*
 import kotlin.reflect.*
@@ -96,7 +97,7 @@ public val KType.javaType: Type
 public val Class<*>.kotlinPackage: KPackage?
     get() = if (getSimpleName().endsWith("Package") &&
                 getAnnotation(javaClass<kotlin.jvm.internal.KotlinPackage>()) != null) {
-        val field = this.getField("\$moduleName")
+        val field = this.getField(JvmAbi.KOTLIN_MODULE_FIELD_NAME)
         if (field != null) {
             KPackageImpl(this, field.get(null) as String)
         } else {