| Index: src/hydrogen.cc
|
| ===================================================================
|
| --- src/hydrogen.cc (revision 7030)
|
| +++ src/hydrogen.cc (working copy)
|
| @@ -1813,15 +1813,6 @@
|
| HValue* use,
|
| Representation to,
|
| bool is_truncating) {
|
| - // Propagate flags for negative zero checks upwards from conversions
|
| - // int32-to-tagged and int32-to-double.
|
| - Representation from = value->representation();
|
| - if (from.IsInteger32()) {
|
| - ASSERT(to.IsTagged() || to.IsDouble());
|
| - BitVector visited(GetMaximumValueID());
|
| - PropagateMinusZeroChecks(value, &visited);
|
| - }
|
| -
|
| // Insert the representation change right before its use. For phi-uses we
|
| // insert at the end of the corresponding predecessor.
|
| HBasicBlock* insert_block = use->block();
|
| @@ -1984,6 +1975,30 @@
|
| }
|
|
|
|
|
| +void HGraph::ComputeMinusZeroChecks() {
|
| + BitVector visited(GetMaximumValueID());
|
| + for (int i = 0; i < blocks_.length(); ++i) {
|
| + for (HInstruction* current = blocks_[i]->first();
|
| + current != NULL;
|
| + current = current->next()) {
|
| + if (current->IsChange()) {
|
| + HChange* change = HChange::cast(current);
|
| + // Propagate flags for negative zero checks upwards from conversions
|
| + // int32-to-tagged and int32-to-double.
|
| + Representation from = change->value()->representation();
|
| + ASSERT(from.Equals(change->from()));
|
| + if (from.IsInteger32()) {
|
| + ASSERT(change->to().IsTagged() || change->to().IsDouble());
|
| + ASSERT(visited.IsEmpty());
|
| + PropagateMinusZeroChecks(change->value(), &visited);
|
| + visited.Clear();
|
| + }
|
| + }
|
| + }
|
| + }
|
| +}
|
| +
|
| +
|
| // Implementation of utility classes to represent an expression's context in
|
| // the AST.
|
| AstContext::AstContext(HGraphBuilder* owner, Expression::Context kind)
|
| @@ -2243,6 +2258,7 @@
|
| graph_->InitializeInferredTypes();
|
| graph_->Canonicalize();
|
| graph_->InsertRepresentationChanges();
|
| + graph_->ComputeMinusZeroChecks();
|
|
|
| // Eliminate redundant stack checks on backwards branches.
|
| HStackCheckEliminator sce(graph_);
|
| @@ -3370,9 +3386,10 @@
|
| LookupGlobalPropertyCell(var, &lookup, true);
|
| CHECK_BAILOUT;
|
|
|
| + bool check_hole = !lookup.IsDontDelete() || lookup.IsReadOnly();
|
| Handle<GlobalObject> global(graph()->info()->global_object());
|
| Handle<JSGlobalPropertyCell> cell(global->GetPropertyCell(&lookup));
|
| - HInstruction* instr = new HStoreGlobal(value, cell);
|
| + HInstruction* instr = new HStoreGlobal(value, cell, check_hole);
|
| instr->set_position(position);
|
| AddInstruction(instr);
|
| if (instr->HasSideEffects()) AddSimulate(ast_id);
|
| @@ -3389,7 +3406,6 @@
|
| // We have a second position recorded in the FullCodeGenerator to have
|
| // type feedback for the binary operation.
|
| BinaryOperation* operation = expr->binary_operation();
|
| - operation->RecordTypeFeedback(oracle());
|
|
|
| if (var != NULL) {
|
| if (!var->is_global() && !var->IsStackAllocated()) {
|
| @@ -3540,9 +3556,11 @@
|
| VISIT_FOR_VALUE(expr->exception());
|
|
|
| HValue* value = environment()->Pop();
|
| - HControlInstruction* instr = new HThrow(value);
|
| + HThrow* instr = new HThrow(value);
|
| instr->set_position(expr->position());
|
| - current_subgraph_->FinishExit(instr);
|
| + AddInstruction(instr);
|
| + AddSimulate(expr->id());
|
| + current_subgraph_->FinishExit(new HAbnormalExit);
|
| }
|
|
|
|
|
| @@ -4813,7 +4831,7 @@
|
| default:
|
| UNREACHABLE();
|
| }
|
| - TypeInfo info = oracle()->BinaryType(expr, TypeFeedbackOracle::RESULT);
|
| + TypeInfo info = oracle()->BinaryType(expr);
|
| // If we hit an uninitialized binary op stub we will get type info
|
| // for a smi operation. If one of the operands is a constant string
|
| // do not generate code assuming it is a smi operation.
|
| @@ -4964,7 +4982,7 @@
|
| HValue* left = Pop();
|
| Token::Value op = expr->op();
|
|
|
| - TypeInfo info = oracle()->CompareType(expr, TypeFeedbackOracle::RESULT);
|
| + TypeInfo info = oracle()->CompareType(expr);
|
| HInstruction* instr = NULL;
|
| if (op == Token::INSTANCEOF) {
|
| // Check to see if the rhs of the instanceof is a global function not
|
|
|