Put PushArgument into the environment instead of raw values.

runtime/vm/intermediate_language.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 207 matching lines @@
   // TODO(regis): Can type feedback provide information about the static type
   // of a passed-in parameter?
   // Note that in checked mode, we could return the static type of the formal
   // parameter. However, this would be wrong if ParameterInstr is used to type
   // check the passed-in parameter, since the type check would then always be
   // wrongly eliminated.
   return Type::DynamicType();
 }
 
 
+RawAbstractType* PushArgumentInstr::StaticType() const {
+  return AbstractType::null();
+}
+
+
 intptr_t JoinEntryInstr::IndexOfPredecessor(BlockEntryInstr* pred) const {
   for (intptr_t i = 0; i < predecessors_.length(); ++i) {
     if (predecessors_[i] == pred) return i;
   }
   return -1;
 }
 
 
 // ==== Recording assigned variables.
 void Computation::RecordAssignedVars(BitVector* assigned_vars,
@@ skipping 938 matching lines @@
   // Instead of popping the value it is left alone on the simulated frame
   // and materialized on the physical stack before the call.
   // TODO(fschneider): Avoid special-casing for SSA mode here.
   if (compiler->is_ssa()) {
     ASSERT(locs()->in(0).IsRegister());
     __ PushRegister(locs()->in(0).reg());
   }
 }
 
 
-void Environment::InitializeLocations(FlowGraphAllocator* allocator,
-                                      intptr_t block_start_pos,
-                                      intptr_t environment_pos) {
-  // Any value mentioned in the deoptimization environment should survive
-  // until the end of instruction but it does not need to be in the register.
-  // Expected shape of live range:
-  //
-  //                 i  i'
-  //      value    -----*
-  //
-  ASSERT(locations_ == NULL);
-  location_count_ = values_.length();
-  if (location_count_ > 0) {
-    locations_ =
-        Isolate::Current()->current_zone()->Alloc<Location>(location_count_);
-    for (intptr_t i = 0; i < location_count_; ++i) {
-      Value* value = values_[i];
-      if (value->IsUse()) {
-        locations_[i] = Location::Any();
-        const intptr_t vreg = value->AsUse()->definition()->ssa_temp_index();
-        LiveRange* range = allocator->GetLiveRange(vreg);
-        range->AddUseInterval(block_start_pos, environment_pos);
-        range->AddUse(environment_pos, &locations_[i]);
-      } else {
-        ASSERT(value->IsConstant());
-        locations_[i] = Location::NoLocation();
-      }
-    }
-  }
-}
-
-
 #undef __
 
 }  // namespace dart