Revert 12534006

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 99 matching lines @@
   V(Uint8Array)                                                                \
   V(Uint8ClampedArray)                                                         \
   V(Int16Array)                                                                \
   V(Uint16Array)                                                               \
   V(Int32Array)                                                                \
   V(Uint32Array)                                                               \
   V(Int64Array)                                                                \
   V(Uint64Array)                                                               \
   V(Float32Array)                                                              \
   V(Float64Array)                                                              \
-  V(Float32x4Array)                                                            \
 
 #define CLASS_LIST_FOR_HANDLES(V)                                              \
   CLASS_LIST_NO_OBJECT_OR_STRING(V)                                            \
   V(String)
 
 #define CLASS_LIST_NO_OBJECT(V)                                                \
   CLASS_LIST_NO_OBJECT_OR_STRING(V)                                            \
   CLASS_LIST_STRINGS(V)
 
 #define CLASS_LIST(V)                                                          \
@@ skipping 1744 matching lines @@
   ASSERT(kTypedDataUint8ArrayCid == kTypedDataInt8ArrayCid + 1 &&
          kTypedDataUint8ClampedArrayCid == kTypedDataInt8ArrayCid + 2 &&
          kTypedDataInt16ArrayCid == kTypedDataInt8ArrayCid + 3 &&
          kTypedDataUint16ArrayCid == kTypedDataInt8ArrayCid + 4 &&
          kTypedDataInt32ArrayCid == kTypedDataInt8ArrayCid + 5 &&
          kTypedDataUint32ArrayCid == kTypedDataInt8ArrayCid + 6 &&
          kTypedDataInt64ArrayCid == kTypedDataInt8ArrayCid + 7 &&
          kTypedDataUint64ArrayCid == kTypedDataInt8ArrayCid + 8 &&
          kTypedDataFloat32ArrayCid == kTypedDataInt8ArrayCid + 9 &&
          kTypedDataFloat64ArrayCid == kTypedDataInt8ArrayCid + 10 &&
-         kTypedDataFloat32x4ArrayCid == kTypedDataInt8ArrayCid + 11 &&
-         kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 12);
+         kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 11);
   return (index >= kTypedDataInt8ArrayCid &&
-          index <= kTypedDataFloat32x4ArrayCid);
+          index <= kTypedDataFloat64ArrayCid);
 }
 
 
 inline bool RawObject::IsTypedDataViewClassId(intptr_t index) {
   // Make sure this is updated when new TypedData types are added.
   ASSERT(kTypedDataUint8ArrayViewCid == kTypedDataInt8ArrayViewCid + 1 &&
          kTypedDataUint8ClampedArrayViewCid == kTypedDataInt8ArrayViewCid + 2 &&
          kTypedDataInt16ArrayViewCid == kTypedDataInt8ArrayViewCid + 3 &&
          kTypedDataUint16ArrayViewCid == kTypedDataInt8ArrayViewCid + 4 &&
          kTypedDataInt32ArrayViewCid == kTypedDataInt8ArrayViewCid + 5 &&
          kTypedDataUint32ArrayViewCid == kTypedDataInt8ArrayViewCid + 6 &&
          kTypedDataInt64ArrayViewCid == kTypedDataInt8ArrayViewCid + 7 &&
          kTypedDataUint64ArrayViewCid == kTypedDataInt8ArrayViewCid + 8 &&
          kTypedDataFloat32ArrayViewCid == kTypedDataInt8ArrayViewCid + 9 &&
          kTypedDataFloat64ArrayViewCid == kTypedDataInt8ArrayViewCid + 10 &&
-         kTypedDataFloat32x4ArrayViewCid == kTypedDataInt8ArrayViewCid + 11 &&
-         kByteDataViewCid == kTypedDataInt8ArrayViewCid + 12 &&
-         kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 13);
+         kByteDataViewCid == kTypedDataInt8ArrayViewCid + 11 &&
+         kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 12);
   return (index >= kTypedDataInt8ArrayViewCid &&
           index <= kByteDataViewCid);
 }
 
 
 inline bool RawObject::IsExternalTypedDataClassId(intptr_t index) {
   // Make sure this is updated when new ExternalTypedData types are added.
   ASSERT((kExternalTypedDataUint8ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 1) &&
          (kExternalTypedDataUint8ClampedArrayCid ==
           kExternalTypedDataInt8ArrayCid + 2) &&
          (kExternalTypedDataInt16ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 3) &&
          (kExternalTypedDataUint16ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 4) &&
          (kExternalTypedDataInt32ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 5) &&
          (kExternalTypedDataUint32ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 6) &&
          (kExternalTypedDataInt64ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 7) &&
          (kExternalTypedDataUint64ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 8) &&
          (kExternalTypedDataFloat32ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 9) &&
          (kExternalTypedDataFloat64ArrayCid ==
           kExternalTypedDataInt8ArrayCid + 10) &&
-         (kExternalTypedDataFloat32x4ArrayCid ==
-          kExternalTypedDataInt8ArrayCid + 11) &&
-         (kNullCid == kExternalTypedDataInt8ArrayCid + 12));
+         (kNullCid == kExternalTypedDataInt8ArrayCid + 11));
   return (index >= kExternalTypedDataInt8ArrayCid &&
-          index <= kExternalTypedDataFloat32x4ArrayCid);
+          index <= kExternalTypedDataFloat64ArrayCid);
 }
 
 
 inline intptr_t RawObject::NumberOfTypedDataClasses() {
   // Make sure this is updated when new TypedData types are added.
-  ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 12);
-  ASSERT(kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 13);
-  ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 12);
+  ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 11);
+  ASSERT(kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 12);
+  ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 11);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_