Make creation of list literal more resilient to changes in the underlying

runtime/vm/snapshot.cc

 // 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.
 
 #include "vm/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/exceptions.h"
@@ skipping 20 matching lines @@
 static bool IsObjectStoreClassId(intptr_t class_id) {
   // Check if this is a class which is stored in the object store.
   return (class_id == kObjectCid ||
           (class_id >= kInstanceCid && class_id <= kWeakPropertyCid) ||
           RawObject::IsStringClassId(class_id));
 }
 
 
 static bool IsObjectStoreTypeId(intptr_t index) {
   // Check if this is a type which is stored in the object store.
-  return (index >= kObjectType && index <= kListInterface);
+  return (index >= kObjectType && index <= kArrayType);
 }
 
 
 static intptr_t ClassIdFromObjectId(intptr_t object_id) {
   ASSERT(object_id > kClassIdsOffset);
   intptr_t class_id = (object_id - kClassIdsOffset);
   return class_id;
 }
 
 
@@ skipping 10 matching lines @@
     case kDynamicType: return object_store->dynamic_type();
     case kVoidType: return object_store->void_type();
     case kFunctionType: return object_store->function_type();
     case kNumberType: return object_store->number_type();
     case kSmiType: return object_store->smi_type();
     case kMintType: return object_store->mint_type();
     case kDoubleType: return object_store->double_type();
     case kIntType: return object_store->int_type();
     case kBoolType: return object_store->bool_type();
     case kStringType: return object_store->string_type();
-    case kListInterface: return object_store->list_interface();
+    case kArrayType: return object_store->array_type();
     default: break;
   }
   UNREACHABLE();
   return Type::null();
 }
 
 
 static int GetTypeIndex(ObjectStore* object_store, const RawType* raw_type) {
   ASSERT(raw_type->IsHeapObject());
   if (raw_type == object_store->object_type()) {
@@ skipping 13 matching lines @@
   } else if (raw_type == object_store->mint_type()) {
     return kMintType;
   } else if (raw_type == object_store->double_type()) {
     return kDoubleType;
   } else if (raw_type == object_store->int_type()) {
     return kIntType;
   } else if (raw_type == object_store->bool_type()) {
     return kBoolType;
   } else if (raw_type == object_store->string_type()) {
     return kStringType;
-  } else if (raw_type == object_store->list_interface()) {
-    return kListInterface;
+  } else if (raw_type == object_store->array_type()) {
+    return kArrayType;
   }
   return kInvalidIndex;
 }
 
 
 // TODO(5411462): Temporary setup of snapshot for testing purposes,
 // the actual creation of a snapshot maybe done differently.
 const Snapshot* Snapshot::SetupFromBuffer(const void* raw_memory) {
   ASSERT(raw_memory != NULL);
   ASSERT(kHeaderSize == sizeof(Snapshot));
@@ skipping 1152 matching lines @@
     UnmarkAll();
     isolate->set_long_jump_base(base);
   } else {
     isolate->set_long_jump_base(base);
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart