Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index 25299ef6950bcb77d52c6d6ed47f9be587e78d0f..18dc9e1dddb7815cf0ca12a87453ff7ae4fb48de 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -1576,8 +1576,8 @@ void ICCompareStub::GenerateGeneric(MacroAssembler* masm) { |
Condition cc = GetCondition(); |
Label miss; |
- CheckInputType(masm, edx, left_, &miss); |
- CheckInputType(masm, eax, right_, &miss); |
+ CheckInputType(masm, edx, left(), &miss); |
+ CheckInputType(masm, eax, right(), &miss); |
// Compare two smis. |
Label non_smi, smi_done; |
@@ -3395,7 +3395,7 @@ void BinaryOpICWithAllocationSiteStub::Generate(MacroAssembler* masm) { |
void ICCompareStub::GenerateSmis(MacroAssembler* masm) { |
- DCHECK(state_ == CompareIC::SMI); |
+ DCHECK(state() == CompareIC::SMI); |
Label miss; |
__ mov(ecx, edx); |
__ or_(ecx, eax); |
@@ -3421,16 +3421,16 @@ void ICCompareStub::GenerateSmis(MacroAssembler* masm) { |
void ICCompareStub::GenerateNumbers(MacroAssembler* masm) { |
- DCHECK(state_ == CompareIC::NUMBER); |
+ DCHECK(state() == CompareIC::NUMBER); |
Label generic_stub; |
Label unordered, maybe_undefined1, maybe_undefined2; |
Label miss; |
- if (left_ == CompareIC::SMI) { |
+ if (left() == CompareIC::SMI) { |
__ JumpIfNotSmi(edx, &miss); |
} |
- if (right_ == CompareIC::SMI) { |
+ if (right() == CompareIC::SMI) { |
__ JumpIfNotSmi(eax, &miss); |
} |
@@ -3477,12 +3477,12 @@ void ICCompareStub::GenerateNumbers(MacroAssembler* masm) { |
__ bind(&unordered); |
__ bind(&generic_stub); |
- ICCompareStub stub(isolate(), op_, CompareIC::GENERIC, CompareIC::GENERIC, |
+ ICCompareStub stub(isolate(), op(), CompareIC::GENERIC, CompareIC::GENERIC, |
CompareIC::GENERIC); |
__ jmp(stub.GetCode(), RelocInfo::CODE_TARGET); |
__ bind(&maybe_undefined1); |
- if (Token::IsOrderedRelationalCompareOp(op_)) { |
+ if (Token::IsOrderedRelationalCompareOp(op())) { |
__ cmp(eax, Immediate(isolate()->factory()->undefined_value())); |
__ j(not_equal, &miss); |
__ JumpIfSmi(edx, &unordered); |
@@ -3492,7 +3492,7 @@ void ICCompareStub::GenerateNumbers(MacroAssembler* masm) { |
} |
__ bind(&maybe_undefined2); |
- if (Token::IsOrderedRelationalCompareOp(op_)) { |
+ if (Token::IsOrderedRelationalCompareOp(op())) { |
__ cmp(edx, Immediate(isolate()->factory()->undefined_value())); |
__ j(equal, &unordered); |
} |
@@ -3503,7 +3503,7 @@ void ICCompareStub::GenerateNumbers(MacroAssembler* masm) { |
void ICCompareStub::GenerateInternalizedStrings(MacroAssembler* masm) { |
- DCHECK(state_ == CompareIC::INTERNALIZED_STRING); |
+ DCHECK(state() == CompareIC::INTERNALIZED_STRING); |
DCHECK(GetCondition() == equal); |
// Registers containing left and right operands respectively. |
@@ -3548,7 +3548,7 @@ void ICCompareStub::GenerateInternalizedStrings(MacroAssembler* masm) { |
void ICCompareStub::GenerateUniqueNames(MacroAssembler* masm) { |
- DCHECK(state_ == CompareIC::UNIQUE_NAME); |
+ DCHECK(state() == CompareIC::UNIQUE_NAME); |
DCHECK(GetCondition() == equal); |
// Registers containing left and right operands respectively. |
@@ -3593,10 +3593,10 @@ void ICCompareStub::GenerateUniqueNames(MacroAssembler* masm) { |
void ICCompareStub::GenerateStrings(MacroAssembler* masm) { |
- DCHECK(state_ == CompareIC::STRING); |
+ DCHECK(state() == CompareIC::STRING); |
Label miss; |
- bool equality = Token::IsEqualityOp(op_); |
+ bool equality = Token::IsEqualityOp(op()); |
// Registers containing left and right operands respectively. |
Register left = edx; |
@@ -3683,7 +3683,7 @@ void ICCompareStub::GenerateStrings(MacroAssembler* masm) { |
void ICCompareStub::GenerateObjects(MacroAssembler* masm) { |
- DCHECK(state_ == CompareIC::OBJECT); |
+ DCHECK(state() == CompareIC::OBJECT); |
Label miss; |
__ mov(ecx, edx); |
__ and_(ecx, eax); |
@@ -3734,7 +3734,7 @@ void ICCompareStub::GenerateMiss(MacroAssembler* masm) { |
__ push(eax); |
__ push(edx); // And also use them as the arguments. |
__ push(eax); |
- __ push(Immediate(Smi::FromInt(op_))); |
+ __ push(Immediate(Smi::FromInt(op()))); |
__ CallExternalReference(miss, 3); |
// Compute the entry point of the rewritten stub. |
__ lea(edi, FieldOperand(eax, Code::kHeaderSize)); |