From 47b08af66cbf8b1861de44ffcb146f687ade6f6a Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 25 Jun 2014 20:12:34 +0400
Subject: [PATCH] Inline HashPMap entry's getter methods

---
 .../jvm/internal/pcollections/HashPMap.java       |  6 +++---
 .../jvm/internal/pcollections/MapEntry.java       | 15 +++------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/pcollections/HashPMap.java b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/pcollections/HashPMap.java
index eae81f149ea..6909aa304c6 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/pcollections/HashPMap.java
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/pcollections/HashPMap.java
@@ -46,8 +46,8 @@ public final class HashPMap<K, V> {
     public V get(Object key) {
         ConsPStack<MapEntry<K, V>> entries = getEntries(key.hashCode());
         for (MapEntry<K, V> entry : entries)
-            if (entry.getKey().equals(key))
-                return entry.getValue();
+            if (entry.key.equals(key))
+                return entry.value;
         return null;
     }
 
@@ -81,7 +81,7 @@ public final class HashPMap<K, V> {
     private static <K, V> int keyIndexIn(ConsPStack<MapEntry<K, V>> entries, Object key) {
         int i = 0;
         for (MapEntry<K, V> entry : entries) {
-            if (entry.getKey().equals(key))
+            if (entry.key.equals(key))
                 return i;
             i++;
         }
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/pcollections/MapEntry.java b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/pcollections/MapEntry.java
index ccfa49a0878..08d1b8288c9 100644
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/pcollections/MapEntry.java
+++ b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/pcollections/MapEntry.java
@@ -19,22 +19,14 @@ package kotlin.reflect.jvm.internal.pcollections;
 final class MapEntry<K, V> implements java.io.Serializable {
     private static final long serialVersionUID = 7138329143949025153L;
 
-    private final K key;
-    private final V value;
+    public final K key;
+    public final V value;
 
     public MapEntry(K key, V value) {
         this.key = key;
         this.value = value;
     }
 
-    public K getKey() {
-        return key;
-    }
-
-    public V getValue() {
-        return value;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (!(o instanceof MapEntry)) return false;
@@ -45,8 +37,7 @@ final class MapEntry<K, V> implements java.io.Serializable {
 
     @Override
     public int hashCode() {
-        return (key == null ? 0 : key.hashCode()) ^
-                (value == null ? 0 : value.hashCode());
+        return (key == null ? 0 : key.hashCode()) ^ (value == null ? 0 : value.hashCode());
     }
 
     @Override