Add class id constants fields to dart:_internal class 'ClassID'. Use the fields in the library (mor…

runtime/vm/flow_graph_optimizer.cc

 // Copyright (c) 2013, 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_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/cpu.h"
 #include "vm/dart_entry.h"
@@ skipping 4345 matching lines @@
                                         call->deopt_id(),
                                         recognized_kind,
                                         call->token_pos());
     ReplaceCall(call, invoke);
   } else if (recognized_kind == MethodRecognizer::kObjectArrayConstructor) {
     Value* type = new(I) Value(call->ArgumentAt(0));
     Value* num_elements = new(I) Value(call->ArgumentAt(1));
     CreateArrayInstr* create_array =
         new(I) CreateArrayInstr(call->token_pos(), type, num_elements);
     ReplaceCall(call, create_array);
-  } else if (Library::PrivateCoreLibName(Symbols::ClassId()).Equals(
-      String::Handle(I, call->function().name()))) {
-    // Check for core library get:_classId.
-    intptr_t cid = Class::Handle(I, call->function().Owner()).id();
-    // Currently only implemented for a subset of classes.
-    ASSERT((cid == kOneByteStringCid) || (cid == kTwoByteStringCid) ||
-           (cid == kExternalOneByteStringCid) ||
-           (cid == kGrowableObjectArrayCid) ||
-           (cid == kImmutableArrayCid) || (cid == kArrayCid));
-    ConstantInstr* cid_instr =
-        new(I) ConstantInstr(Smi::Handle(I, Smi::New(cid)));
-    ReplaceCall(call, cid_instr);
   } else if (call->function().IsFactory()) {
     const Class& function_class =
         Class::Handle(I, call->function().Owner());
     if ((function_class.library() == Library::CoreLibrary()) ||
         (function_class.library() == Library::TypedDataLibrary())) {
       intptr_t cid = FactoryRecognizer::ResultCid(call->function());
       switch (cid) {
         case kArrayCid: {
           Value* type = new(I) Value(call->ArgumentAt(0));
           Value* num_elements = new(I) Value(call->ArgumentAt(1));
@@ skipping 5442 matching lines @@
   }
 
   // Insert materializations at environment uses.
   for (intptr_t i = 0; i < exits.length(); i++) {
     CreateMaterializationAt(exits[i], alloc, alloc->cls(), *slots);
   }
 }
 
 
 }  // namespace dart