A64: Synchronize with r16249.

src/hydrogen-escape-analysis.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 92 matching lines @@
   HCapturedObject* state = NewState(previous);
   for (int index = 0; index < number_of_values_; index++) {
     HValue* operand = old_state->OperandAt(index);
     state->SetOperandAt(index, operand);
   }
   return state;
 }
 
 
 // Insert a newly created phi into the given block and fill all incoming
-// edges with the given value. The merge index is chosen so that it is
-// unique for this particular scalar replacement index.
+// edges with the given value.
 HPhi* HEscapeAnalysisPhase::NewPhiAndInsert(
     HBasicBlock* block, HValue* incoming_value, int index) {
   Zone* zone = graph()->zone();
-  HBasicBlock* pred = block->predecessors()->first();
-  int phi_index = pred->last_environment()->length() + cumulative_values_;
-  HPhi* phi = new(zone) HPhi(phi_index + index, zone);
+  HPhi* phi = new(zone) HPhi(HPhi::kInvalidMergedIndex, zone);
   for (int i = 0; i < block->predecessors()->length(); i++) {
     phi->AddInput(incoming_value);
   }
   block->AddPhi(phi);
   return phi;
 }
 
 
 // Performs a forward data-flow analysis of all loads and stores on the
 // given captured allocation. This uses a reverse post-order iteration
@@ skipping 77 matching lines @@
           HCheckHeapObject* check = HCheckHeapObject::cast(instr);
           if (check->value() != allocate) continue;
           check->DeleteAndReplaceWith(NULL);
           break;
         }
         case HValue::kCheckMaps: {
           HCheckMaps* mapcheck = HCheckMaps::cast(instr);
           if (mapcheck->value() != allocate) continue;
           // TODO(mstarzinger): This approach breaks if the tracked map value
           // is not a HConstant. Find a repro test case and fix this.
+          for (HUseIterator it(mapcheck->uses()); !it.Done(); it.Advance()) {
+            if (!it.value()->IsLoadNamedField()) continue;
+            HLoadNamedField* load = HLoadNamedField::cast(it.value());
+            ASSERT(load->typecheck() == mapcheck);
+            load->ClearTypeCheck();
+          }
           ASSERT(mapcheck->HasNoUses());
+
           mapcheck->DeleteAndReplaceWith(NULL);
           break;
         }
         default:
           // Nothing to see here, move along ...
           break;
       }
     }
 
     // Propagate the block state forward to all successor blocks.
@@ skipping 54 matching lines @@
     AnalyzeDataFlow(allocate);
 
     cumulative_values_ += number_of_values_;
     ASSERT(allocate->HasNoUses());
     ASSERT(!allocate->IsLinked());
   }
 }
 
 
 } }  // namespace v8::internal