The dart version of typeddata library has changed to be compatible with the dart2js implementation

runtime/vm/raw_object.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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 132 matching lines @@
   kTypedData##clazz##ViewCid,
 CLASS_LIST_TYPED_DATA(DEFINE_OBJECT_KIND)
   kByteDataViewCid,
 #undef DEFINE_OBJECT_KIND
 
 #define DEFINE_OBJECT_KIND(clazz)                                              \
   kExternalTypedData##clazz##Cid,
 CLASS_LIST_TYPED_DATA(DEFINE_OBJECT_KIND)
 #undef DEFINE_OBJECT_KIND
 
+  kByteBufferCid,
+
   // The following entries do not describe a predefined class, but instead
   // are class indexes for pre-allocated instance (Null, dynamic and Void).
   kNullCid,
   kDynamicCid,
   kVoidCid,
 
   // The following entry does not describe a real class, but instead it is an
   // id which is used to identify free list elements in the heap.
   kFreeListElement,
 
@@ skipping 247 matching lines @@
   static bool IsStringClassId(intptr_t index);
   static bool IsOneByteStringClassId(intptr_t index);
   static bool IsTwoByteStringClassId(intptr_t index);
   static bool IsExternalStringClassId(intptr_t index);
   static bool IsBuiltinListClassId(intptr_t index);
   static bool IsTypedDataClassId(intptr_t index);
   static bool IsTypedDataViewClassId(intptr_t index);
   static bool IsExternalTypedDataClassId(intptr_t index);
   static bool IsInternalVMdefinedClassId(intptr_t index);
   static bool IsVariableSizeClassId(intptr_t index);
+  static bool IsImplicitFieldClassId(intptr_t index);
 
   static intptr_t NumberOfTypedDataClasses();
 
  private:
   uword tags_;  // Various object tags (bits).
 
   class WatchedBit : public BitField<bool, kWatchedBit, 1> {};
 
   class MarkBit : public BitField<bool, kMarkBit, 1> {};
 
@@ skipping 14 matching lines @@
 
   intptr_t SizeFromClass() const;
 
   intptr_t GetClassId() const {
     uword tags = ptr()->tags_;
     return ClassIdTag::decode(tags);
   }
 
   friend class Api;
   friend class Array;
+  friend class ByteBuffer;
   friend class Code;
   friend class FreeListElement;
   friend class GCMarker;
   friend class ExternalTypedData;
   friend class ForwardList;
   friend class Heap;
   friend class HeapMapAsJSONVisitor;
   friend class ClassStatsVisitor;
   friend class MarkingVisitor;
   friend class Object;
@@ skipping 1362 matching lines @@
 }
 
 
 inline bool RawObject::IsBuiltinListClassId(intptr_t index) {
   // Make sure this function is updated when new builtin List types are added.
   COMPILE_ASSERT(kImmutableArrayCid == kArrayCid + 1);
   return ((index >= kArrayCid && index <= kImmutableArrayCid) ||
           (index == kGrowableObjectArrayCid) ||
           IsTypedDataClassId(index) ||
           IsTypedDataViewClassId(index) ||
-          IsExternalTypedDataClassId(index));
+          IsExternalTypedDataClassId(index) ||
+          (index == kByteBufferCid));
 }
 
 
 inline bool RawObject::IsTypedDataClassId(intptr_t index) {
   // Make sure this is updated when new TypedData types are added.
   COMPILE_ASSERT(kTypedDataUint8ArrayCid == kTypedDataInt8ArrayCid + 1 &&
                  kTypedDataUint8ClampedArrayCid == kTypedDataInt8ArrayCid + 2 &&
                  kTypedDataInt16ArrayCid == kTypedDataInt8ArrayCid + 3 &&
                  kTypedDataUint16ArrayCid == kTypedDataInt8ArrayCid + 4 &&
                  kTypedDataInt32ArrayCid == kTypedDataInt8ArrayCid + 5 &&
@@ skipping 56 matching lines @@
       (kExternalTypedDataFloat32ArrayCid ==
        kExternalTypedDataInt8ArrayCid + 9) &&
       (kExternalTypedDataFloat64ArrayCid ==
        kExternalTypedDataInt8ArrayCid + 10) &&
       (kExternalTypedDataFloat32x4ArrayCid ==
        kExternalTypedDataInt8ArrayCid + 11) &&
       (kExternalTypedDataInt32x4ArrayCid ==
        kExternalTypedDataInt8ArrayCid + 12) &&
       (kExternalTypedDataFloat64x2ArrayCid ==
        kExternalTypedDataInt8ArrayCid + 13) &&
-      (kNullCid == kExternalTypedDataInt8ArrayCid + 14));
+      (kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14));
   return (index >= kExternalTypedDataInt8ArrayCid &&
           index <= kExternalTypedDataFloat64x2ArrayCid);
 }
 
 
 inline bool RawObject::IsInternalVMdefinedClassId(intptr_t index) {
   return ((index < kNumPredefinedCids) &&
-          !RawObject::IsTypedDataViewClassId(index));
+          !RawObject::IsImplicitFieldClassId(index));
 }
 
 
-
 inline bool RawObject::IsVariableSizeClassId(intptr_t index) {
   return (index == kArrayCid) ||
          (index == kImmutableArrayCid) ||
          RawObject::IsOneByteStringClassId(index) ||
          RawObject::IsTwoByteStringClassId(index) ||
          RawObject::IsTypedDataClassId(index) ||
          (index == kContextCid) ||
          (index == kTypeArgumentsCid) ||
          (index == kInstructionsCid) ||
          (index == kPcDescriptorsCid) ||
          (index == kStackmapCid) ||
          (index == kLocalVarDescriptorsCid) ||
          (index == kExceptionHandlersCid) ||
          (index == kDeoptInfoCid) ||
          (index == kCodeCid) ||
          (index == kContextScopeCid) ||
          (index == kInstanceCid) ||
          (index == kBigintCid) ||
          (index == kJSRegExpCid);
 }
 
 
+// This is a set of classes that are not Dart classes whose representation
+// is defined by the VM but are used in the VM code by computing the
+// implicit field offsets of the various fields in the dart object.
+inline bool RawObject::IsImplicitFieldClassId(intptr_t index) {
+  return (IsTypedDataViewClassId(index) || index == kByteBufferCid);
+}
+
+
 inline intptr_t RawObject::NumberOfTypedDataClasses() {
   // Make sure this is updated when new TypedData types are added.
   COMPILE_ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
-  COMPILE_ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 14);
+  COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
+  COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_