More preparation for removal of dart:scalarlist

runtime/vm/flow_graph_builder.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/flow_graph_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
@@ skipping 1784 matching lines @@
   InstanceCallInstr* call = new InstanceCallInstr(
       node->token_pos(),
       node->function_name(), Token::kILLEGAL, arguments,
       node->arguments()->names(), 1);
   ReturnDefinition(call);
 }
 
 
 static intptr_t GetResultCidOfNative(const Function& function) {
   const Class& function_class = Class::Handle(function.Owner());
-  if (function_class.library() == Library::ScalarlistLibrary()) {
+  if (function_class.library() == Library::TypedDataLibrary()) {
     const String& function_name = String::Handle(function.name());
     if (!String::EqualsIgnoringPrivateKey(function_name, Symbols::_New())) {
       return kDynamicCid;
     }
     switch (function_class.id()) {
-      case kInt8ArrayCid:
-      case kUint8ArrayCid:
-      case kUint8ClampedArrayCid:
-      case kInt16ArrayCid:
-      case kUint16ArrayCid:
-      case kInt32ArrayCid:
-      case kUint32ArrayCid:
-      case kInt64ArrayCid:
-      case kUint64ArrayCid:
-      case kFloat32ArrayCid:
-      case kFloat64ArrayCid:
+      case kTypedDataInt8ArrayCid:
+      case kTypedDataUint8ArrayCid:
+      case kTypedDataUint8ClampedArrayCid:
+      case kTypedDataInt16ArrayCid:
+      case kTypedDataUint16ArrayCid:
+      case kTypedDataInt32ArrayCid:
+      case kTypedDataUint32ArrayCid:
+      case kTypedDataInt64ArrayCid:
+      case kTypedDataUint64ArrayCid:
+      case kTypedDataFloat32ArrayCid:
+      case kTypedDataFloat64ArrayCid:
         return function_class.id();
       default:
         return kDynamicCid;  // Unknown.
     }
   }
   return kDynamicCid;
 }
 
 
 // <Expression> ::= StaticCall { function: Function
@@ skipping 140 matching lines @@
 
 
 // List of recognized list factories in core lib:
 // (factory-name-symbol, result-cid, fingerprint).
 // TODO(srdjan): Store the values in the snapshot instead.
 // TODO(srdjan): Add Float32x4List.
 #define RECOGNIZED_LIST_FACTORY_LIST(V)                                        \
   V(ObjectArrayFactory, kArrayCid, 97987288)                                   \
   V(GrowableObjectArrayWithData, kGrowableObjectArrayCid, 816132033)           \
   V(GrowableObjectArrayFactory, kGrowableObjectArrayCid, 224791427)            \
-  V(Int8ListFactory, kInt8ArrayCid, 216496111)                                 \
-  V(Uint8ListFactory, kUint8ArrayCid, 1767464978)                              \
-  V(Uint8ClampedListFactory, kUint8ClampedArrayCid, 1968602860)                \
-  V(Int16ListFactory, kInt16ArrayCid, 1760814825)                              \
-  V(Uint16ListFactory, kUint16ArrayCid, 1684498763)                            \
-  V(Int32ListFactory, kInt32ArrayCid, 1376656162)                              \
-  V(Uint32ListFactory, kUint32ArrayCid, 1954207744)                            \
-  V(Int64ListFactory, kInt64ArrayCid, 284215425)                               \
-  V(Uint64ListFactory, kUint64ArrayCid, 870102373)                             \
-  V(Float64ListFactory, kFloat64ArrayCid, 436526211)                           \
-  V(Float32ListFactory, kFloat32ArrayCid, 1434337247)                          \
+  V(Int8ListFactory, kTypedDataInt8ArrayCid, 1178498933)                       \
+  V(Uint8ListFactory, kTypedDataUint8ArrayCid, 996047641)                      \
+  V(Uint8ClampedListFactory, kTypedDataUint8ClampedArrayCid, 1504313643)       \
+  V(Int16ListFactory, kTypedDataInt16ArrayCid, 1595869856)                     \
+  V(Uint16ListFactory, kTypedDataUint16ArrayCid, 665298027)                    \
+  V(Int32ListFactory, kTypedDataInt32ArrayCid, 728173538)                      \
+  V(Uint32ListFactory, kTypedDataUint32ArrayCid, 352036624)                    \
+  V(Int64ListFactory, kTypedDataInt64ArrayCid, 105935265)                      \
+  V(Uint64ListFactory, kTypedDataUint64ArrayCid, 943403644)                    \
+  V(Float64ListFactory, kTypedDataFloat64ArrayCid, 348533743)                  \
+  V(Float32ListFactory, kTypedDataFloat32ArrayCid, 1830794379)                 \
 
 
 // Class that recognizes factories and returns corresponding result cid.
 class FactoryRecognizer : public AllStatic {
  public:
   // Return kDynamicCid if factory is not recognized.
   static intptr_t ResultCid(const Function& factory) {
     ASSERT(factory.IsFactory());
     const Class& function_class = Class::Handle(factory.Owner());
     const Library& lib = Library::Handle(function_class.library());
     ASSERT((lib.raw() == Library::CoreLibrary()) ||
-        (lib.raw() == Library::ScalarlistLibrary()));
+        (lib.raw() == Library::TypedDataLibrary()));
     const String& factory_name = String::Handle(factory.name());
 #define RECOGNIZE_FACTORY(test_factory_symbol, cid, fp)                        \
     if (String::EqualsIgnoringPrivateKey(                                      \
         factory_name, Symbols::test_factory_symbol())) {                       \
       ASSERT(factory.CheckSourceFingerprint(fp));                              \
       return cid;                                                              \
     }                                                                          \
 
 RECOGNIZED_LIST_FACTORY_LIST(RECOGNIZE_FACTORY);
 #undef RECOGNIZE_FACTORY
 
     return kDynamicCid;
   }
 };
 
 
 static intptr_t GetResultCidOfListFactory(ConstructorCallNode* node) {
   const Function& function = node->constructor();
   const Class& function_class = Class::Handle(function.Owner());
 
   if ((function_class.library() != Library::CoreLibrary()) &&
-      (function_class.library() != Library::ScalarlistLibrary())) {
+      (function_class.library() != Library::TypedDataLibrary())) {
     return kDynamicCid;
   }
 
   if (node->constructor().IsFactory()) {
     if ((function_class.Name() == Symbols::List().raw()) &&
         (function.name() == Symbols::ListFactory().raw())) {
       // Special recognition of 'new List()' vs 'new List(n)'.
       if (node->arguments()->length() == 0) {
         return kGrowableObjectArrayCid;
       }
@@ skipping 1269 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart