From a44def05cce8e59a6cd74765dacadd075a6581d2 Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 6 Apr 2015 13:59:01 +0300
Subject: [PATCH] Rollback hack for rangeTo safe call support

---
 .../jetbrains/kotlin/codegen/ExpressionCodegen.java | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index fff5f9509de..1d772e344eb 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -2322,7 +2322,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
             @NotNull CallGenerator callGenerator,
             @NotNull ArgumentGenerator argumentGenerator
     ) {
-        StackValue.SafeCall safeCallReceiver = receiver instanceof StackValue.SafeCall ? (StackValue.SafeCall) receiver : null;
+        callableMethod.beforeParameterGeneration(v, null);
+
         if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already
             receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod);
 
@@ -2334,15 +2335,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
                 }
             }
 
-            if (safeCallReceiver != null) {
-                //justCoerce
-                receiver.put(receiver.type, v);
-                callableMethod.beforeParameterGeneration(v, StackValue.onStack(receiver.type));
-            }
-            else {
-                callableMethod.beforeParameterGeneration(v, null);
-                receiver.put(receiver.type, v);
-            }
+            receiver.put(receiver.type, v);
         }
 
         callGenerator.putHiddenParams();