From a83643c5e2635b42b0b834a98984f89e06d36342 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 8 Apr 2011 20:03:42 +0200
Subject: [PATCH] Revert "more sane types for StackValue.cmp()"

This reverts commit 5bebb848b638c3fa29e1568815a219746336c0ef.

Conflicts:

	idea/src/org/jetbrains/jet/codegen/StackValue.java
---
 idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java | 2 +-
 idea/src/org/jetbrains/jet/codegen/StackValue.java        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 90a0df7fd23..726b82d7c04 100644
--- a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -594,7 +594,7 @@ public class ExpressionCodegen extends JetVisitor {
     private void generateCompareOp(JetBinaryExpression expression, IElementType opToken, Type type) {
         gen(expression.getLeft(), type);
         gen(expression.getRight(), type);
-        myStack.push(StackValue.cmp(opToken));
+        myStack.push(StackValue.cmp(opToken, type));
     }
 
     private void generateAssignmentExpression(JetBinaryExpression expression) {
diff --git a/idea/src/org/jetbrains/jet/codegen/StackValue.java b/idea/src/org/jetbrains/jet/codegen/StackValue.java
index fb3ae926cbb..203e22e6435 100644
--- a/idea/src/org/jetbrains/jet/codegen/StackValue.java
+++ b/idea/src/org/jetbrains/jet/codegen/StackValue.java
@@ -32,8 +32,8 @@ public abstract class StackValue {
         return new Constant(value, type);
     }
 
-    public static StackValue cmp(IElementType opToken) {
-        return new NumberCompare(opToken);
+    public static StackValue cmp(IElementType opToken, Type type) {
+        return new NumberCompare(opToken, type);
     }
 
     public static StackValue not(StackValue stackValue) {
@@ -173,8 +173,8 @@ public abstract class StackValue {
     private static class NumberCompare extends StackValue {
         private final IElementType opToken;
 
-        public NumberCompare(IElementType opToken) {
-            super(Type.BOOLEAN_TYPE);
+        public NumberCompare(IElementType opToken, Type type) {
+            super(type);
             this.opToken = opToken;
         }