Reland and fix bug: Don't store redundant compile-type at values.

runtime/vm/deopt_instructions.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_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
@@ skipping 426 matching lines @@
   RawDeoptInfo* CreateDeoptInfo(const Array& deopt_table);
 
   // Mark the actual start of the frame description after all materialization
   // instructions were emitted. Used for verification purposes.
   void MarkFrameStart() {
     ASSERT(frame_start_ == -1);
     frame_start_ = instructions_.length();
   }
 
  private:
+  friend class CompilerDeoptInfo;  // For current_info_number_.
+
   class TrieNode;
 
   CpuRegisterSource ToCpuRegisterSource(const Location& loc);
   FpuRegisterSource ToFpuRegisterSource(const Location& loc,
                                       Location::Kind expected_stack_slot_kind);
 
   intptr_t FindOrAddObjectInTable(const Object& obj) const;
   intptr_t FindMaterialization(MaterializeObjectInstr* mat) const;
   intptr_t CalculateStackIndex(const Location& source_loc) const;
 
@@ skipping 58 matching lines @@
   class ReasonField : public BitField<ICData::DeoptReasonId, 0, 8> { };
   class FlagsField : public BitField<uint32_t, 8, 8> { };
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_