Index: src/arm/lithium-codegen-arm.h |
diff --git a/src/arm/lithium-codegen-arm.h b/src/arm/lithium-codegen-arm.h |
index 59d4ba4ac78c76bfc16ea3c5c9f2bbd10348724c..5d5135dc1b900d66753264987ad1b2dca742c8ca 100644 |
--- a/src/arm/lithium-codegen-arm.h |
+++ b/src/arm/lithium-codegen-arm.h |
@@ -280,11 +280,11 @@ class LCodeGen BASE_EMBEDDED { |
void RegisterEnvironmentForDeoptimization(LEnvironment* environment, |
Safepoint::DeoptMode mode); |
- void DeoptimizeIf(Condition cc, |
+ void DeoptimizeIf(Condition condition, |
LEnvironment* environment, |
Deoptimizer::BailoutType bailout_type); |
- void DeoptimizeIf(Condition cc, LEnvironment* environment); |
- void ApplyCheckIf(Condition cc, LBoundsCheck* check); |
+ void DeoptimizeIf(Condition condition, LEnvironment* environment); |
+ void ApplyCheckIf(Condition condition, LBoundsCheck* check); |
void AddToTranslation(LEnvironment* environment, |
Translation* translation, |
@@ -322,7 +322,9 @@ class LCodeGen BASE_EMBEDDED { |
static Condition TokenToCondition(Token::Value op, bool is_unsigned); |
void EmitGoto(int block); |
template<class InstrType> |
- void EmitBranch(InstrType instr, Condition cc); |
+ void EmitBranch(InstrType instr, Condition condition); |
+ template<class InstrType> |
+ void EmitFalseBranch(InstrType instr, Condition condition); |
void EmitNumberUntagD(Register input, |
DwVfpRegister result, |
bool allow_undefined_as_nan, |