Revert r31326.

runtime/vm/deferred_objects.h

 // Copyright (c) 2013, 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.
 
 #ifndef VM_DEFERRED_OBJECTS_H_
 #define VM_DEFERRED_OBJECTS_H_
 
 #include "platform/globals.h"
 
 namespace dart {
 
 // Forward declarations.
 class Instance;
 class RawInstance;
 class RawObject;
-class DeoptContext;
 
 // Used by the deoptimization infrastructure to defer allocation of
 // unboxed objects until frame is fully rewritten and GC is safe.
 // Describes a stack slot that should be populated with a reference to
 // the materialized object.
 class DeferredSlot {
  public:
   DeferredSlot(RawInstance** slot, DeferredSlot* next)
       : slot_(slot), next_(next) { }
   virtual ~DeferredSlot() { }
 
   RawInstance** slot() const { return slot_; }
   DeferredSlot* next() const { return next_; }
 
-  virtual void Materialize(DeoptContext* deopt_context) = 0;
+  virtual void Materialize() = 0;
 
  private:
   RawInstance** const slot_;
   DeferredSlot* const next_;
 
   DISALLOW_COPY_AND_ASSIGN(DeferredSlot);
 };
 
 
 class DeferredDouble : public DeferredSlot {
  public:
   DeferredDouble(double value, RawInstance** slot, DeferredSlot* next)
       : DeferredSlot(slot, next), value_(value) { }
 
-  virtual void Materialize(DeoptContext* deopt_context);
+  virtual void Materialize();
 
   double value() const { return value_; }
 
  private:
   const double value_;
 
   DISALLOW_COPY_AND_ASSIGN(DeferredDouble);
 };
 
 
 class DeferredMint : public DeferredSlot {
  public:
   DeferredMint(int64_t value, RawInstance** slot, DeferredSlot* next)
       : DeferredSlot(slot, next), value_(value) { }
 
-  virtual void Materialize(DeoptContext* deopt_context);
+  virtual void Materialize();
 
   int64_t value() const { return value_; }
 
  private:
   const int64_t value_;
 
   DISALLOW_COPY_AND_ASSIGN(DeferredMint);
 };
 
 
 class DeferredFloat32x4 : public DeferredSlot {
  public:
   DeferredFloat32x4(simd128_value_t value, RawInstance** slot,
                     DeferredSlot* next)
       : DeferredSlot(slot, next), value_(value) { }
 
-  virtual void Materialize(DeoptContext* deopt_context);
+  virtual void Materialize();
 
   simd128_value_t value() const { return value_; }
 
  private:
   const simd128_value_t value_;
 
   DISALLOW_COPY_AND_ASSIGN(DeferredFloat32x4);
 };
 
 
 class DeferredInt32x4 : public DeferredSlot {
  public:
   DeferredInt32x4(simd128_value_t value, RawInstance** slot,
                    DeferredSlot* next)
       : DeferredSlot(slot, next), value_(value) { }
 
-  virtual void Materialize(DeoptContext* deopt_context);
+  virtual void Materialize();
 
   simd128_value_t value() const { return value_; }
 
  private:
   const simd128_value_t value_;
 
   DISALLOW_COPY_AND_ASSIGN(DeferredInt32x4);
 };
 
 
 // Describes a slot that contains a reference to an object that had its
 // allocation removed by AllocationSinking pass.
 // Object itself is described and materialized by DeferredObject.
 class DeferredObjectRef : public DeferredSlot {
  public:
   DeferredObjectRef(intptr_t index, RawInstance** slot, DeferredSlot* next)
       : DeferredSlot(slot, next), index_(index) { }
 
-  virtual void Materialize(DeoptContext* deopt_context);
+  virtual void Materialize();
 
   intptr_t index() const { return index_; }
 
  private:
   const intptr_t index_;
 
   DISALLOW_COPY_AND_ASSIGN(DeferredObjectRef);
 };
 
 
@@ skipping 53 matching lines @@
 
   // Object materialized from this description.
   const Instance* object_;
 
   DISALLOW_COPY_AND_ASSIGN(DeferredObject);
 };
 
 }  // namespace dart
 
 #endif  // VM_DEFERRED_OBJECTS_H_