From d0e21c53d4a9cf6ad26e2c9964add344ef386921 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 27 Jul 2015 15:05:21 +0300
Subject: [PATCH] Minor, pull 'name' up to KPropertyImpl

---
 .../src/kotlin/reflect/jvm/internal/KProperty0Impl.kt           | 2 --
 .../src/kotlin/reflect/jvm/internal/KProperty1Impl.kt           | 2 --
 .../src/kotlin/reflect/jvm/internal/KProperty2Impl.kt           | 2 --
 .../src/kotlin/reflect/jvm/internal/KPropertyImpl.kt            | 2 ++
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty0Impl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty0Impl.kt
index 7ba6d0802f0..78b98fdbfe6 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty0Impl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty0Impl.kt
@@ -28,8 +28,6 @@ open class KProperty0Impl<out R> : DescriptorBasedProperty<R>, KProperty0<R>, KP
 
     constructor(container: KCallableContainerImpl, name: String, signature: String) : super(container, name, signature)
 
-    override val name: String get() = descriptor.getName().asString()
-
     override val getter by ReflectProperties.lazy { Getter(this) }
 
     override val javaGetter: Method get() = super.javaGetter!!
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty1Impl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty1Impl.kt
index 5484412278d..ed8205b06de 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty1Impl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty1Impl.kt
@@ -28,8 +28,6 @@ open class KProperty1Impl<T, out R> : DescriptorBasedProperty<R>, KProperty1<T,
 
     constructor(container: KCallableContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
 
-    override val name: String get() = descriptor.getName().asString()
-
     override val getter by ReflectProperties.lazy { Getter(this) }
 
     // TODO: consider optimizing this, not to do complex checks on every access
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty2Impl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty2Impl.kt
index 38810e99194..61199c69af8 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty2Impl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty2Impl.kt
@@ -27,8 +27,6 @@ open class KProperty2Impl<D, E, out R> : DescriptorBasedProperty<R>, KProperty2<
 
     constructor(container: KCallableContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
 
-    override val name: String get() = descriptor.getName().asString()
-
     override val getter by ReflectProperties.lazy { Getter(this) }
 
     override val javaGetter: Method get() = super.javaGetter!!
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
index bdb29d29ae4..60a333af8a2 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
@@ -34,6 +34,8 @@ interface KPropertyImpl<out R> : KProperty<R>, KCallableImpl<R> {
 
     override val descriptor: PropertyDescriptor
 
+    override val name: String get() = descriptor.name.asString()
+
     interface Accessor<out R> : KProperty.Accessor<R> {
         override val property: KPropertyImpl<R>
     }