From cd26feb7e9f9eb36af9453f3cdb55cfc4e6e5ec4 Mon Sep 17 00:00:00 2001 From: Aart Bik Date: Wed, 23 Sep 2015 17:50:50 -0700 Subject: Minor cleanup in range analysis. (1) replaced min/max macro as previously required. (2) removed some redundant code by merging min/max into one. Change-Id: I610879a06d550346bfac7e6e12ec0299ba226a37 --- compiler/optimizing/induction_var_range.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'compiler/optimizing/induction_var_range.h') diff --git a/compiler/optimizing/induction_var_range.h b/compiler/optimizing/induction_var_range.h index 96cbd46279..8280c8bedc 100644 --- a/compiler/optimizing/induction_var_range.h +++ b/compiler/optimizing/induction_var_range.h @@ -79,10 +79,9 @@ class InductionVarRange { HInductionVarAnalysis::InductionInfo* trip, bool is_min); - static Value GetMin(HInductionVarAnalysis::InductionInfo* info, - HInductionVarAnalysis::InductionInfo* trip); - static Value GetMax(HInductionVarAnalysis::InductionInfo* info, - HInductionVarAnalysis::InductionInfo* trip); + static Value GetVal(HInductionVarAnalysis::InductionInfo* info, + HInductionVarAnalysis::InductionInfo* trip, + bool is_min); static Value GetMul(HInductionVarAnalysis::InductionInfo* info1, HInductionVarAnalysis::InductionInfo* info2, HInductionVarAnalysis::InductionInfo* trip, @@ -96,8 +95,7 @@ class InductionVarRange { static Value SubValue(Value v1, Value v2); static Value MulValue(Value v1, Value v2); static Value DivValue(Value v1, Value v2); - static Value MinValue(Value v1, Value v2); - static Value MaxValue(Value v1, Value v2); + static Value MergeVal(Value v1, Value v2, bool is_min); /** Results of prior induction variable analysis. */ HInductionVarAnalysis *induction_analysis_; -- cgit v1.2.3-59-g8ed1b