| Index: src/hydrogen.cc
|
| diff --git a/src/hydrogen.cc b/src/hydrogen.cc
|
| index e34688051d53f9fa75691d6db382ddcc18795c6c..79d530e8da91e205a6088255813da05a14210c99 100644
|
| --- a/src/hydrogen.cc
|
| +++ b/src/hydrogen.cc
|
| @@ -1156,7 +1156,7 @@ void HGraphBuilder::BuildTransitionElementsKind(HValue* object,
|
|
|
| IfBuilder if_builder(this);
|
|
|
| - if_builder.IfNot<HCompareObjectEqAndBranch>(elements, empty_fixed_array);
|
| + if_builder.IfNot<HCompareObjectAndBranch>(elements, empty_fixed_array);
|
|
|
| if_builder.Then();
|
|
|
| @@ -1740,13 +1740,13 @@ void HGraphBuilder::BuildCompareNil(
|
| bool needs_or = false;
|
| if (type->Maybe(Type::Null())) {
|
| if (needs_or) if_nil.Or();
|
| - if_nil.If<HCompareObjectEqAndBranch>(value, graph()->GetConstantNull());
|
| + if_nil.If<HCompareObjectAndBranch>(value, graph()->GetConstantNull());
|
| needs_or = true;
|
| }
|
| if (type->Maybe(Type::Undefined())) {
|
| if (needs_or) if_nil.Or();
|
| - if_nil.If<HCompareObjectEqAndBranch>(value,
|
| - graph()->GetConstantUndefined());
|
| + if_nil.If<HCompareObjectAndBranch>(value,
|
| + graph()->GetConstantUndefined());
|
| needs_or = true;
|
| }
|
| if (type->Maybe(Type::Undetectable())) {
|
| @@ -4943,7 +4943,7 @@ void HOptimizedGraphBuilder::HandleGlobalVariableAssignment(
|
| if (cell->type()->AsConstant()->IsNumber()) {
|
| builder.If<HCompareNumericAndBranch>(value, constant, Token::EQ);
|
| } else {
|
| - builder.If<HCompareObjectEqAndBranch>(value, constant);
|
| + builder.If<HCompareObjectAndBranch>(value, constant);
|
| }
|
| builder.Then();
|
| builder.Else();
|
| @@ -7791,7 +7791,7 @@ HValue* HGraphBuilder::TruncateToNumber(HValue* value, Handle<Type>* expected) {
|
| // TODO(olivf) The BinaryOpStub only records undefined. It might pay off to
|
| // also record booleans and convert them to 0/1 here.
|
| IfBuilder if_nan(this);
|
| - if_nan.If<HCompareObjectEqAndBranch>(value,
|
| + if_nan.If<HCompareObjectAndBranch>(value,
|
| graph()->GetConstantUndefined());
|
| if_nan.Then();
|
| if_nan.ElseDeopt();
|
| @@ -8120,8 +8120,8 @@ void HOptimizedGraphBuilder::VisitCompareOperation(CompareOperation* expr) {
|
| Token::Value op = expr->op();
|
|
|
| if (IsLiteralCompareBool(left, op, right)) {
|
| - HCompareObjectEqAndBranch* result =
|
| - new(zone()) HCompareObjectEqAndBranch(left, right);
|
| + HCompareObjectAndBranch* result =
|
| + new(zone()) HCompareObjectAndBranch(left, right);
|
| result->set_position(expr->position());
|
| return ast_context()->ReturnControl(result, expr->id());
|
| }
|
| @@ -8193,8 +8193,8 @@ void HOptimizedGraphBuilder::VisitCompareOperation(CompareOperation* expr) {
|
| Handle<Map> map = combined_type->AsClass();
|
| AddCheckMapsWithTransitions(left, map);
|
| AddCheckMapsWithTransitions(right, map);
|
| - HCompareObjectEqAndBranch* result =
|
| - new(zone()) HCompareObjectEqAndBranch(left, right);
|
| + HCompareObjectAndBranch* result =
|
| + new(zone()) HCompareObjectAndBranch(left, right);
|
| result->set_position(expr->position());
|
| return ast_context()->ReturnControl(result, expr->id());
|
| } else {
|
| @@ -8202,8 +8202,8 @@ void HOptimizedGraphBuilder::VisitCompareOperation(CompareOperation* expr) {
|
| AddInstruction(HCheckInstanceType::NewIsSpecObject(left, zone()));
|
| BuildCheckHeapObject(right);
|
| AddInstruction(HCheckInstanceType::NewIsSpecObject(right, zone()));
|
| - HCompareObjectEqAndBranch* result =
|
| - new(zone()) HCompareObjectEqAndBranch(left, right);
|
| + HCompareObjectAndBranch* result =
|
| + new(zone()) HCompareObjectAndBranch(left, right);
|
| result->set_position(expr->position());
|
| return ast_context()->ReturnControl(result, expr->id());
|
| }
|
| @@ -8217,8 +8217,8 @@ void HOptimizedGraphBuilder::VisitCompareOperation(CompareOperation* expr) {
|
| AddInstruction(HCheckInstanceType::NewIsInternalizedString(left, zone()));
|
| BuildCheckHeapObject(right);
|
| AddInstruction(HCheckInstanceType::NewIsInternalizedString(right, zone()));
|
| - HCompareObjectEqAndBranch* result =
|
| - new(zone()) HCompareObjectEqAndBranch(left, right);
|
| + HCompareObjectAndBranch* result =
|
| + new(zone()) HCompareObjectAndBranch(left, right);
|
| result->set_position(expr->position());
|
| return ast_context()->ReturnControl(result, expr->id());
|
| } else {
|
| @@ -8256,7 +8256,7 @@ void HOptimizedGraphBuilder::HandleLiteralCompareNil(CompareOperation* expr,
|
| HIfContinuation continuation;
|
| if (expr->op() == Token::EQ_STRICT) {
|
| IfBuilder if_nil(this);
|
| - if_nil.If<HCompareObjectEqAndBranch>(
|
| + if_nil.If<HCompareObjectAndBranch>(
|
| value, (nil == kNullValue) ? graph()->GetConstantNull()
|
| : graph()->GetConstantUndefined());
|
| if_nil.Then();
|
| @@ -9053,8 +9053,8 @@ void HOptimizedGraphBuilder::GenerateObjectEquals(CallRuntime* call) {
|
| CHECK_ALIVE(VisitForValue(call->arguments()->at(1)));
|
| HValue* right = Pop();
|
| HValue* left = Pop();
|
| - HCompareObjectEqAndBranch* result =
|
| - new(zone()) HCompareObjectEqAndBranch(left, right);
|
| + HCompareObjectAndBranch* result =
|
| + new(zone()) HCompareObjectAndBranch(left, right);
|
| return ast_context()->ReturnControl(result, call->id());
|
| }
|
|
|
|
|