Ooops, forgot to commit the renamings in Hydrogen for issue 6976028....

TBR=danno@chromium.org
Review URL: http://codereview.chromium.org/7105014

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8132 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 68c20c7f
...@@ -5093,10 +5093,13 @@ void HGraphBuilder::VisitBinaryOperation(BinaryOperation* expr) { ...@@ -5093,10 +5093,13 @@ void HGraphBuilder::VisitBinaryOperation(BinaryOperation* expr) {
ASSERT(current_block() != NULL); ASSERT(current_block() != NULL);
ASSERT(current_block()->HasPredecessor()); ASSERT(current_block()->HasPredecessor());
switch (expr->op()) { switch (expr->op()) {
case Token::COMMA: return VisitComma(expr); case Token::COMMA:
case Token::OR: return VisitAndOr(expr, false); return VisitComma(expr);
case Token::AND: return VisitAndOr(expr, true); case Token::OR:
default: return VisitCommon(expr); case Token::AND:
return VisitLogicalExpression(expr);
default:
return VisitArithmeticExpression(expr);
} }
} }
...@@ -5109,7 +5112,8 @@ void HGraphBuilder::VisitComma(BinaryOperation* expr) { ...@@ -5109,7 +5112,8 @@ void HGraphBuilder::VisitComma(BinaryOperation* expr) {
} }
void HGraphBuilder::VisitAndOr(BinaryOperation* expr, bool is_logical_and) { void HGraphBuilder::VisitLogicalExpression(BinaryOperation* expr) {
bool is_logical_and = expr->op() == Token::AND;
if (ast_context()->IsTest()) { if (ast_context()->IsTest()) {
TestContext* context = TestContext::cast(ast_context()); TestContext* context = TestContext::cast(ast_context());
// Translate left subexpression. // Translate left subexpression.
...@@ -5196,7 +5200,7 @@ void HGraphBuilder::VisitAndOr(BinaryOperation* expr, bool is_logical_and) { ...@@ -5196,7 +5200,7 @@ void HGraphBuilder::VisitAndOr(BinaryOperation* expr, bool is_logical_and) {
} }
void HGraphBuilder::VisitCommon(BinaryOperation* expr) { void HGraphBuilder::VisitArithmeticExpression(BinaryOperation* expr) {
CHECK_ALIVE(VisitForValue(expr->left())); CHECK_ALIVE(VisitForValue(expr->left()));
CHECK_ALIVE(VisitForValue(expr->right())); CHECK_ALIVE(VisitForValue(expr->right()));
HValue* right = Pop(); HValue* right = Pop();
......
...@@ -753,8 +753,8 @@ class HGraphBuilder: public AstVisitor { ...@@ -753,8 +753,8 @@ class HGraphBuilder: public AstVisitor {
void VisitNot(UnaryOperation* expr); void VisitNot(UnaryOperation* expr);
void VisitComma(BinaryOperation* expr); void VisitComma(BinaryOperation* expr);
void VisitAndOr(BinaryOperation* expr, bool is_logical_and); void VisitLogicalExpression(BinaryOperation* expr);
void VisitCommon(BinaryOperation* expr); void VisitArithmeticExpression(BinaryOperation* expr);
void PreProcessOsrEntry(IterationStatement* statement); void PreProcessOsrEntry(IterationStatement* statement);
// True iff. we are compiling for OSR and the statement is the entry. // True iff. we are compiling for OSR and the statement is the entry.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment