Merge libv1.

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"
 #include "vm/snapshot.h"
 
 namespace dart {
 
 // Macrobatics to define the Object hierarchy of VM implementation classes.
-#define CLASS_LIST_NO_OBJECT(V)                                                \
+#define CLASS_LIST_NO_OBJECT_OR_STRING(V)                                      \
   V(Class)                                                                     \
   V(UnresolvedClass)                                                           \
   V(AbstractTypeArguments)                                                     \
     V(TypeArguments)                                                           \
     V(InstantiatedTypeArguments)                                               \
   V(PatchClass)                                                                \
   V(Function)                                                                  \
   V(ClosureData)                                                               \
   V(RedirectionData)                                                           \
   V(Field)                                                                     \
@@ skipping 22 matching lines @@
   V(Instance)                                                                  \
     V(AbstractType)                                                            \
       V(Type)                                                                  \
       V(TypeParameter)                                                         \
     V(Number)                                                                  \
       V(Integer)                                                               \
         V(Smi)                                                                 \
         V(Mint)                                                                \
         V(Bigint)                                                              \
       V(Double)                                                                \
-    V(String)                                                                  \
-      V(OneByteString)                                                         \
-      V(TwoByteString)                                                         \
-      V(ExternalOneByteString)                                                 \
-      V(ExternalTwoByteString)                                                 \
     V(Bool)                                                                    \
     V(Array)                                                                   \
       V(ImmutableArray)                                                        \
     V(GrowableObjectArray)                                                     \
     V(ByteArray)                                                               \
       V(Int8Array)                                                             \
       V(Uint8Array)                                                            \
       V(Int16Array)                                                            \
       V(Uint16Array)                                                           \
       V(Int32Array)                                                            \
@@ skipping 10 matching lines @@
       V(ExternalUint32Array)                                                   \
       V(ExternalInt64Array)                                                    \
       V(ExternalUint64Array)                                                   \
       V(ExternalFloat32Array)                                                  \
       V(ExternalFloat64Array)                                                  \
     V(Stacktrace)                                                              \
     V(JSRegExp)                                                                \
     V(WeakProperty)                                                            \
     V(DartFunction)                                                            \
 
+#define CLASS_LIST_STRINGS(V)                                                  \
+  V(String)                                                                    \
+    V(OneByteString)                                                           \
+    V(TwoByteString)                                                           \
+    V(ExternalOneByteString)                                                   \
+    V(ExternalTwoByteString)
+
+#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)                                                          \
   V(Object)                                                                    \
   CLASS_LIST_NO_OBJECT(V)
 
 
 // Forward declarations.
 class Isolate;
 #define DEFINE_FORWARD_DECLARATION(clazz)                                      \
   class Raw##clazz;
 CLASS_LIST(DEFINE_FORWARD_DECLARATION)
@@ skipping 274 matching lines @@
   friend class Heap;
   friend class HeapProfiler;
   friend class HeapProfilerRootVisitor;
   friend class MarkingVisitor;
   friend class Object;
   friend class RawInstructions;
   friend class RawInstance;
   friend class Scavenger;
   friend class SnapshotReader;
   friend class SnapshotWriter;
+  friend class String;
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(RawObject);
 };
 
 
 class RawClass : public RawObject {
  public:
   enum ClassState {
     kAllocated,     // Initial state.
@@ skipping 1088 matching lines @@
   return (index >= kErrorCid && index < kInstanceCid);
 }
 
 
 inline bool RawObject::IsNumberClassId(intptr_t index) {
   // Make sure this function is updated when new Number types are added.
   ASSERT(kIntegerCid == kNumberCid + 1 &&
          kSmiCid == kNumberCid + 2 &&
          kMintCid == kNumberCid + 3 &&
          kBigintCid == kNumberCid + 4 &&
-         kDoubleCid == kNumberCid + 5 &&
-         kStringCid == kNumberCid + 6);
-  return (index >= kNumberCid && index < kStringCid);
+         kDoubleCid == kNumberCid + 5);
+  return (index >= kNumberCid && index < kBoolCid);
 }
 
 
 inline bool RawObject::IsIntegerClassId(intptr_t index) {
   // Make sure this function is updated when new Integer types are added.
   ASSERT(kSmiCid == kIntegerCid + 1 &&
          kMintCid == kIntegerCid + 2 &&
          kBigintCid == kIntegerCid + 3 &&
          kDoubleCid == kIntegerCid + 4);
   return (index >= kIntegerCid && index < kDoubleCid);
 }
 
 
 inline bool RawObject::IsStringClassId(intptr_t index) {
   // Make sure this function is updated when new StringCid types are added.
   ASSERT(kOneByteStringCid == kStringCid + 1 &&
          kTwoByteStringCid == kStringCid + 2 &&
          kExternalOneByteStringCid == kStringCid + 3 &&
-         kExternalTwoByteStringCid == kStringCid + 4 &&
-         kBoolCid == kStringCid + 5);
-  return (index >= kStringCid && index < kBoolCid);
+         kExternalTwoByteStringCid == kStringCid + 4);
+  return (index >= kStringCid && index <= kExternalTwoByteStringCid);
 }
 
 
 inline bool RawObject::IsOneByteStringClassId(intptr_t index) {
   // Make sure this function is updated when new StringCid types are added.
   ASSERT(kOneByteStringCid == kStringCid + 1 &&
          kTwoByteStringCid == kStringCid + 2 &&
          kExternalOneByteStringCid == kStringCid + 3 &&
-         kExternalTwoByteStringCid == kStringCid + 4 &&
-         kBoolCid == kStringCid + 5);
+         kExternalTwoByteStringCid == kStringCid + 4);
   return (index == kOneByteStringCid || index == kExternalOneByteStringCid);
 }
 
 
 inline bool RawObject::IsTwoByteStringClassId(intptr_t index) {
   // Make sure this function is updated when new StringCid types are added.
   ASSERT(kOneByteStringCid == kStringCid + 1 &&
          kTwoByteStringCid == kStringCid + 2 &&
          kExternalOneByteStringCid == kStringCid + 3 &&
-         kExternalTwoByteStringCid == kStringCid + 4 &&
-         kBoolCid == kStringCid + 5);
+         kExternalTwoByteStringCid == kStringCid + 4);
   return (index == kOneByteStringCid ||
           index == kTwoByteStringCid ||
           index == kExternalOneByteStringCid ||
           index == kExternalTwoByteStringCid);
 }
 
 
 inline bool RawObject::IsExternalStringClassId(intptr_t index) {
   // Make sure this function is updated when new StringCid types are added.
   ASSERT(kOneByteStringCid == kStringCid + 1 &&
          kTwoByteStringCid == kStringCid + 2 &&
          kExternalOneByteStringCid == kStringCid + 3 &&
-         kExternalTwoByteStringCid == kStringCid + 4 &&
-         kBoolCid == kStringCid + 5);
+         kExternalTwoByteStringCid == kStringCid + 4);
   return (index == kExternalOneByteStringCid ||
           index == kExternalTwoByteStringCid);
 }
 
 
 inline bool RawObject::IsBuiltinListClassId(intptr_t index) {
   // Make sure this function is updated when new builtin List types are added.
   ASSERT(kImmutableArrayCid == kArrayCid + 1 &&
          kGrowableObjectArrayCid == kArrayCid + 2 &&
          kByteArrayCid == kArrayCid + 3);
@@ skipping 39 matching lines @@
          kExternalUint64ArrayCid == kExternalInt8ArrayCid + 7 &&
          kExternalFloat32ArrayCid == kExternalInt8ArrayCid + 8 &&
          kExternalFloat64ArrayCid == kExternalInt8ArrayCid + 9 &&
          kStacktraceCid == kExternalInt8ArrayCid + 10);
   return (index >= kExternalInt8ArrayCid && index <= kExternalFloat64ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_