Revert "Revert "Recognize and optimize a.runtimeType == b.runtimeType pattern.""

runtime/vm/object_store.h

 // 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.
 
 #ifndef VM_OBJECT_STORE_H_
 #define VM_OBJECT_STORE_H_
 
 #include "vm/object.h"
 
 namespace dart {
@@ skipping 63 matching lines @@
 
   RawType* number_type() const { return number_type_; }
   void set_number_type(const Type& value) {
     number_type_ = value.raw();
   }
 
   RawType* int_type() const { return int_type_; }
   void set_int_type(const Type& value) {
     int_type_ = value.raw();
   }
+  static intptr_t int_type_offset() {
+    return OFFSET_OF(ObjectStore, int_type_);
+  }
 
   RawClass* integer_implementation_class() const {
     return integer_implementation_class_;
   }
   void set_integer_implementation_class(const Class& value) {
     integer_implementation_class_ = value.raw();
   }
 
   RawClass* smi_class() const { return smi_class_; }
   void set_smi_class(const Class& value) { smi_class_ = value.raw(); }
 
   RawType* smi_type() const { return smi_type_; }
-  void set_smi_type(const Type& value) { smi_type_ = value.raw();
-  }
+  void set_smi_type(const Type& value) { smi_type_ = value.raw(); }
 
   RawClass* double_class() const { return double_class_; }
   void set_double_class(const Class& value) { double_class_ = value.raw(); }
 
   RawType* double_type() const { return double_type_; }
   void set_double_type(const Type& value) { double_type_ = value.raw(); }
+  static intptr_t double_type_offset() {
+    return OFFSET_OF(ObjectStore, double_type_);
+  }
 
   RawClass* mint_class() const { return mint_class_; }
   void set_mint_class(const Class& value) { mint_class_ = value.raw(); }
 
   RawType* mint_type() const { return mint_type_; }
   void set_mint_type(const Type& value) { mint_type_ = value.raw(); }
 
   RawClass* bigint_class() const { return bigint_class_; }
   void set_bigint_class(const Class& value) { bigint_class_ = value.raw(); }
 
   RawType* string_type() const { return string_type_; }
   void set_string_type(const Type& value) {
     string_type_ = value.raw();
   }
+  static intptr_t string_type_offset() {
+    return OFFSET_OF(ObjectStore, string_type_);
+  }
 
   RawClass* compiletime_error_class() const {
     return compiletime_error_class_;
   }
   void set_compiletime_error_class(const Class& value) {
     compiletime_error_class_ = value.raw();
   }
 
   RawClass* future_class() const { return future_class_; }
   void set_future_class(const Class& value) {
@@ skipping 505 matching lines @@
 
   friend class Serializer;
   friend class Deserializer;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectStore);
 };
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_STORE_H_