From 351aa30141eeaabbcfa33d4679449fd0faa16b4b Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 16 Dec 2013 18:18:38 +0400
Subject: [PATCH] Simplify code in StackValue$CollectionElement

---
 .../org/jetbrains/jet/codegen/StackValue.java | 64 ++++---------------
 1 file changed, 14 insertions(+), 50 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
index 43d2bfefdda..b49e60b0372 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
@@ -675,7 +675,7 @@ public abstract class StackValue {
                 v.dup2();   // collection and index
                 return;
             }
-            
+
             int size = 0;
             // ugly hack: getting the last variable index
             int lastIndex = frame.enterTemp(Type.INT_TYPE);
@@ -693,17 +693,6 @@ public abstract class StackValue {
                 v.store((firstParamIndex = lastIndex) - sz, type);
             }
 
-            List<TypeParameterDescriptor> typeParameters = resolvedGetCall.getResultingDescriptor().getTypeParameters();
-            int firstTypeParamIndex = -1;
-            for (int i = typeParameters.size() - 1; i >= 0; --i) {
-                if (typeParameters.get(i).isReified()) {
-                    frame.enterTemp(OBJECT_TYPE);
-                    lastIndex++;
-                    size++;
-                    v.store(firstTypeParamIndex = lastIndex - 1, OBJECT_TYPE);
-                }
-            }
-
             ReceiverValue receiverParameter = resolvedGetCall.getReceiverArgument();
             int receiverIndex = -1;
             if (receiverParameter.exists()) {
@@ -728,24 +717,16 @@ public abstract class StackValue {
 
             int realReceiverIndex;
             Type realReceiverType;
-            if (thisIndex != -1) {
-                if (receiverIndex != -1) {
-                    realReceiverIndex = receiverIndex;
-                    realReceiverType = codegen.typeMapper.mapType(receiverParameter.getType());
-                }
-                else {
-                    realReceiverIndex = thisIndex;
-                    realReceiverType = OBJECT_TYPE;
-                }
+            if (receiverIndex != -1) {
+                realReceiverType = codegen.typeMapper.mapType(receiverParameter.getType());
+                realReceiverIndex = receiverIndex;
+            }
+            else if (thisIndex != -1) {
+                realReceiverType = OBJECT_TYPE;
+                realReceiverIndex = thisIndex;
             }
             else {
-                if (receiverIndex != -1) {
-                    realReceiverType = codegen.typeMapper.mapType(receiverParameter.getType());
-                    realReceiverIndex = receiverIndex;
-                }
-                else {
-                    throw new UnsupportedOperationException();
-                }
+                throw new UnsupportedOperationException();
             }
 
             if (resolvedSetCall.getThisObject().exists()) {
@@ -764,8 +745,8 @@ public abstract class StackValue {
             }
 
             int index = firstParamIndex;
-            for (int i = 0; i != valueParameters.size(); ++i) {
-                Type type = codegen.typeMapper.mapType(valueParameters.get(i).getType());
+            for (ValueParameterDescriptor valueParameter : valueParameters) {
+                Type type = codegen.typeMapper.mapType(valueParameter.getType());
                 int sz = type.getSize();
                 v.load(index - sz, type);
                 index -= sz;
@@ -777,23 +758,12 @@ public abstract class StackValue {
             }
 
             if (receiverIndex != -1) {
-                Type type = codegen.typeMapper.mapType(receiverParameter.getType());
-                v.load(receiverIndex - type.getSize(), type);
-            }
-
-            if (firstTypeParamIndex != -1) {
-                index = firstTypeParamIndex;
-                for (int i = 0; i != typeParameters.size(); ++i) {
-                    if (typeParameters.get(i).isReified()) {
-                        v.load(index - 1, OBJECT_TYPE);
-                        index--;
-                    }
-                }
+                v.load(receiverIndex - realReceiverType.getSize(), realReceiverType);
             }
 
             index = firstParamIndex;
-            for (int i = 0; i != valueParameters.size(); ++i) {
-                Type type = codegen.typeMapper.mapType(valueParameters.get(i).getType());
+            for (ValueParameterDescriptor valueParameter : valueParameters) {
+                Type type = codegen.typeMapper.mapType(valueParameter.getType());
                 int sz = type.getSize();
                 v.load(index - sz, type);
                 index -= sz;
@@ -809,12 +779,6 @@ public abstract class StackValue {
                 return true;
             }
 
-            for (TypeParameterDescriptor typeParameterDescriptor : call.getResultingDescriptor().getTypeParameters()) {
-                if (typeParameterDescriptor.isReified()) {
-                    return false;
-                }
-            }
-
             List<ValueParameterDescriptor> valueParameters = call.getResultingDescriptor().getValueParameters();
             if (valueParameters.size() != valueParamsSize) {
                 return false;