From a05cacc11fa075246c38497c01b949745fadc54b Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 12 Jan 2016 14:00:24 +0000 Subject: Revert "Change condition to opposite if lhs is constant" Breaks arm64 This reverts commit f9f196c55f3b25c3b09350cd8ed5d7ead31f1757. Change-Id: Ie1027a218154b8ded6c1c8f0007720f5be68780d --- compiler/optimizing/nodes.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index cfb71791f4..c06d164523 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -2706,8 +2706,6 @@ class HCondition : public HBinaryOperation { bool IsGtBias() const { return bias_ == ComparisonBias::kGtBias; } - bool IsLtBias() const { return bias_ == ComparisonBias::kLtBias; } - void SetBias(ComparisonBias bias) { bias_ = bias; } bool InstructionDataEquals(HInstruction* other) const OVERRIDE { @@ -2717,23 +2715,13 @@ class HCondition : public HBinaryOperation { bool IsFPConditionTrueIfNaN() const { DCHECK(Primitive::IsFloatingPointType(InputAt(0)->GetType())); IfCondition if_cond = GetCondition(); - if (if_cond == kCondNE) { - return true; - } else if (if_cond == kCondEQ) { - return false; - } - return ((if_cond == kCondGT) || (if_cond == kCondGE)) && IsGtBias(); + return IsGtBias() ? ((if_cond == kCondGT) || (if_cond == kCondGE)) : (if_cond == kCondNE); } bool IsFPConditionFalseIfNaN() const { DCHECK(Primitive::IsFloatingPointType(InputAt(0)->GetType())); IfCondition if_cond = GetCondition(); - if (if_cond == kCondEQ) { - return true; - } else if (if_cond == kCondNE) { - return false; - } - return ((if_cond == kCondLT) || (if_cond == kCondLE)) && IsGtBias(); + return IsGtBias() ? ((if_cond == kCondLT) || (if_cond == kCondLE)) : (if_cond == kCondEQ); } private: -- cgit v1.2.3-59-g8ed1b