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

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 1354 matching lines @@
 
   ClassFinalizer::VerifyBootstrapClasses();
   MarkInvisibleFunctions();
 
   // Set up the intrinsic state of all functions (core, math and typed data).
   Intrinsifier::InitializeState();
 
   // Set up recognized state of all functions (core, math and typed data).
   MethodRecognizer::InitializeState();
 
+  // Adds static const fields (class ids) to the class 'ClassID');
+  lib = Library::LookupLibrary(Symbols::DartInternal());
+  ASSERT(!lib.IsNull());
+  cls = lib.LookupClassAllowPrivate(Symbols::ClassID());
+  ASSERT(!cls.IsNull());
+  Field& field = Field::Handle(isolate);
+  Smi& value = Smi::Handle(isolate);
+
+#define CLASS_LIST_WITH_NULL(V)                                                \
+  V(Null)                                                                      \
+  CLASS_LIST_NO_OBJECT(V)
+
+#define ADD_SET_FIELD(clazz)                                                   \
+  field = Field::New(String::Handle(Symbols::New("cid"#clazz)),                \

[siva, 2014/06/23 21:23:31]

This String::Handle can also be hoisted out and this would become
str = Symbols::New("cid"#clazz);                                  \
field = Field::New(str, true, false, true, cls, 0);               \
....
....

[srdjan, 2014/06/23 22:27:35]

Done.

+      true, false, true, cls, 0);                                              \
+  value = Smi::New(k##clazz##Cid);                                             \
+  field.set_value(value);                                                      \
+  field.set_type(Type::Handle(Type::IntType()));                               \
+  cls.AddField(field);                                                         \
+
+  CLASS_LIST_WITH_NULL(ADD_SET_FIELD)
+#undef ADD_SET_FIELD
+
   return Error::null();
 }
 
 
 void Object::InitFromSnapshot(Isolate* isolate) {
   TIMERSCOPE(isolate, time_bootstrap);
   ObjectStore* object_store = isolate->object_store();
 
   Class& cls = Class::Handle();
 
@@ skipping 17670 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart