diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java
index 3ed5d0aa49f..775086de62a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java
@@ -517,4 +517,11 @@ public class AsmUtil {
             v.invokestatic("jet/runtime/Intrinsics", assertMethodToCall, "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V");
         }
     }
+
+    public static Type comparisonOperandType(Type left, Type right) {
+        if (left == Type.DOUBLE_TYPE || right == Type.DOUBLE_TYPE) return Type.DOUBLE_TYPE;
+        if (left == Type.FLOAT_TYPE || right == Type.FLOAT_TYPE) return Type.FLOAT_TYPE;
+        if (left == Type.LONG_TYPE || right == Type.LONG_TYPE) return Type.LONG_TYPE;
+        return Type.INT_TYPE;
+    }
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index fdb27111383..85d0b80e857 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -2311,7 +2311,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
         }
         else if (opToken == JetTokens.LT || opToken == JetTokens.LTEQ ||
                  opToken == JetTokens.GT || opToken == JetTokens.GTEQ) {
-            return generateCompareTo(expression);
+            return generateComparison(expression);
         }
         else if (opToken == JetTokens.ELVIS) {
             return generateElvis(expression);
@@ -2519,25 +2519,29 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
         return StackValue.onStack(exprType);
     }
 
-    private StackValue generateCompareTo(JetBinaryExpression expression) {
+    private StackValue generateComparison(JetBinaryExpression expression) {
         DeclarationDescriptor target = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getOperationReference());
         assert target instanceof FunctionDescriptor : "compareTo target should be a function: " + target;
         FunctionDescriptor descriptor = (FunctionDescriptor) target;
 
-        StackValue receiver = gen(expression.getLeft());
+        JetExpression left = expression.getLeft();
+        JetExpression right = expression.getRight();
+        StackValue receiver = gen(left);
         Callable callable = resolveToCallable(descriptor, false);
 
-        StackValue result;
+        Type type;
         if (callable instanceof IntrinsicMethod) {
-            result = ((IntrinsicMethod) callable).generate(
-                    this, v, Type.INT_TYPE, expression, Collections.singletonList(expression.getRight()), receiver, state);
+            // Compare two primitive values
+            type = comparisonOperandType(expressionType(left), expressionType(right));
+            receiver.put(type, v);
+            gen(right, type);
         } else {
-            result = invokeOperation(expression, descriptor, (CallableMethod) callable);
+            type = Type.INT_TYPE;
+            StackValue result = invokeOperation(expression, descriptor, (CallableMethod) callable);
+            result.put(type, v);
+            v.iconst(0);
         }
-
-        result.put(Type.INT_TYPE, v);
-        v.iconst(0);
-        return StackValue.cmp(expression.getOperationToken(), Type.INT_TYPE);
+        return StackValue.cmp(expression.getOperationToken(), type);
     }
 
     private StackValue generateAssignmentExpression(JetBinaryExpression expression) {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java
index 16b08af71ee..02f8aa29e66 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java
@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.psi.JetExpression;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
+import static org.jetbrains.jet.codegen.AsmUtil.comparisonOperandType;
 
 /**
  * @author alex.tkachman
@@ -71,11 +71,4 @@ public class CompareTo implements IntrinsicMethod {
         }
         return StackValue.onStack(Type.INT_TYPE);
     }
-
-    private static Type comparisonOperandType(Type left, Type right) {
-        if (left == Type.DOUBLE_TYPE || right == Type.DOUBLE_TYPE) return Type.DOUBLE_TYPE;
-        if (left == Type.FLOAT_TYPE || right == Type.FLOAT_TYPE) return Type.FLOAT_TYPE;
-        if (left == Type.LONG_TYPE || right == Type.LONG_TYPE) return Type.LONG_TYPE;
-        return Type.INT_TYPE;
-    }
 }