- Split Dart core libraries into shared sources and patch sources.

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/bigint_operations.h"
@@ skipping 412 matching lines @@
   const String& name = String::Handle(Symbols::New(cname));
   const Class& cls = Class::Handle(
       Class::NewInterface(name, script, Scanner::kDummyTokenIndex));
   lib.AddClass(cls);
   return cls.raw();
 }
 
 
 void Object::RegisterClass(const Class& cls,
                            const char* cname,
-                           const Script& script,
                            const Library& lib) {
   const String& name = String::Handle(Symbols::New(cname));
   cls.set_name(name);
-  cls.set_script(script);
   lib.AddClass(cls);
 }
 
 
 void Object::RegisterPrivateClass(const Class& cls,
                                   const char* public_class_name,
                                   const Script& script,
                                   const Library& lib) {
   String& str = String::Handle();
   str = Symbols::New(public_class_name);
   str = lib.PrivateName(str);
   cls.set_name(str);
   cls.set_script(script);

[siva, 2012/08/13 18:46:12]

Why is it ok to set the script here in the case of private classes?

[Ivan Posva, 2012/08/13 23:01:17]

Done.

   lib.AddClass(cls);
 }
 
 
 RawError* Object::Init(Isolate* isolate) {
   TIMERSCOPE(time_bootstrap);
   ObjectStore* object_store = isolate->object_store();
 
   Class& cls = Class::Handle();
   Type& type = Type::Handle();
@@ skipping 43 matching lines @@
   const GrowableObjectArray& pending_classes =
       GrowableObjectArray::Handle(GrowableObjectArray::New(Heap::kOld));
   object_store->set_pending_classes(pending_classes);
 
   Context& context = Context::Handle(Context::New(0, Heap::kOld));
   object_store->set_empty_context(context);
 
   // Now that the symbol table is initialized and that the core dictionary as
   // well as the core implementation dictionary have been setup, preallocate
   // remaining classes and register them by name in the dictionaries.
-  const Script& impl_script = Script::Handle(Bootstrap::LoadImplScript());
+  const Script& impl_script = Script::Handle(
+      Bootstrap::LoadCoreImplScript(false));
 
   cls = Class::New<Integer>();
   object_store->set_integer_implementation_class(cls);
-  RegisterClass(cls, "IntegerImplementation", impl_script, core_impl_lib);
+  RegisterClass(cls, "IntegerImplementation", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<Smi>();
   object_store->set_smi_class(cls);
-  RegisterClass(cls, "Smi", impl_script, core_impl_lib);
+  RegisterClass(cls, "Smi", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<Mint>();
   object_store->set_mint_class(cls);
-  RegisterClass(cls, "Mint", impl_script, core_impl_lib);
+  RegisterClass(cls, "Mint", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<Bigint>();
   object_store->set_bigint_class(cls);
-  RegisterClass(cls, "Bigint", impl_script, core_impl_lib);
+  RegisterClass(cls, "Bigint", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<Double>();
   object_store->set_double_class(cls);
-  RegisterClass(cls, "Double", impl_script, core_impl_lib);
+  RegisterClass(cls, "Double", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<Bool>();
   object_store->set_bool_class(cls);
-  RegisterClass(cls, "Bool", impl_script, core_impl_lib);
+  RegisterClass(cls, "Bool", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = object_store->array_class();  // Was allocated above.
-  RegisterClass(cls, "ObjectArray", impl_script, core_impl_lib);
+  RegisterClass(cls, "ObjectArray", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = object_store->growable_object_array_class();  // Was allocated above.
-  RegisterClass(cls, "GrowableObjectArray", impl_script, core_impl_lib);
+  RegisterClass(cls, "GrowableObjectArray", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<ImmutableArray>();
   object_store->set_immutable_array_class(cls);
   cls.set_type_arguments_instance_field_offset(Array::type_arguments_offset());
   ASSERT(object_store->immutable_array_class() != object_store->array_class());
-  RegisterClass(cls, "ImmutableArray", impl_script, core_impl_lib);
+  RegisterClass(cls, "ImmutableArray", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = object_store->one_byte_string_class();  // Was allocated above.
-  RegisterClass(cls, "OneByteString", impl_script, core_impl_lib);
+  RegisterClass(cls, "OneByteString", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<TwoByteString>();
   object_store->set_two_byte_string_class(cls);
-  RegisterClass(cls, "TwoByteString", impl_script, core_impl_lib);
+  RegisterClass(cls, "TwoByteString", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<FourByteString>();
   object_store->set_four_byte_string_class(cls);
-  RegisterClass(cls, "FourByteString", impl_script, core_impl_lib);
+  RegisterClass(cls, "FourByteString", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<ExternalOneByteString>();
   object_store->set_external_one_byte_string_class(cls);
-  RegisterClass(cls, "ExternalOneByteString", impl_script, core_impl_lib);
+  RegisterClass(cls, "ExternalOneByteString", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<ExternalTwoByteString>();
   object_store->set_external_two_byte_string_class(cls);
-  RegisterClass(cls, "ExternalTwoByteString", impl_script, core_impl_lib);
+  RegisterClass(cls, "ExternalTwoByteString", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<ExternalFourByteString>();
   object_store->set_external_four_byte_string_class(cls);
-  RegisterClass(cls, "ExternalFourByteString", impl_script, core_impl_lib);
+  RegisterClass(cls, "ExternalFourByteString", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<Stacktrace>();
   object_store->set_stacktrace_class(cls);
-  RegisterClass(cls, "Stacktrace", impl_script, core_impl_lib);
+  RegisterClass(cls, "Stacktrace", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
   // Super type set below, after Object is allocated.
 
   cls = Class::New<JSRegExp>();
   object_store->set_jsregexp_class(cls);
-  RegisterClass(cls, "JSSyntaxRegExp", impl_script, core_impl_lib);
+  RegisterClass(cls, "JSSyntaxRegExp", core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   // Initialize the base interfaces used by the core VM classes.
-  const Script& script = Script::Handle(Bootstrap::LoadScript());
+  const Script& script = Script::Handle(Bootstrap::LoadCoreScript(false));
 
   // Allocate and initialize the Object class and type.  The Object
   // class and ByteArray subclasses are the only pre-allocated,
   // non-interface classes in the core library.
   cls = Class::New<Instance>();
   object_store->set_object_class(cls);
   cls.set_name(String::Handle(Symbols::New("Object")));
   cls.set_script(script);
   cls.set_is_prefinalized();
   core_lib.AddClass(cls);
@@ skipping 158 matching lines @@
   Library::InitNativeWrappersLibrary(isolate);
   ASSERT(isolate->object_store()->native_wrappers_library() != Library::null());
 
   // Finish the initialization by compiling the bootstrap scripts containing the
   // base interfaces and the implementation of the internal classes.
   Error& error = Error::Handle();
   error = Bootstrap::Compile(core_lib, script);
   if (!error.IsNull()) {
     return error.raw();
   }
+  Script& patch_script = Script::Handle(Bootstrap::LoadCoreScript(true));
+  error = core_lib.Patch(patch_script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
   error = Bootstrap::Compile(core_impl_lib, impl_script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  const Script& math_script = Script::Handle(Bootstrap::LoadMathScript());
+  patch_script = Bootstrap::LoadCoreImplScript(true);
+  error = core_impl_lib.Patch(patch_script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
+  const Script& math_script = Script::Handle(Bootstrap::LoadMathScript(false));
   Library::InitMathLibrary(isolate);
   const Library& math_lib = Library::Handle(Library::MathLibrary());
   ASSERT(!math_lib.IsNull());
   error = Bootstrap::Compile(math_lib, math_script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  const Script& isolate_script = Script::Handle(Bootstrap::LoadIsolateScript());
+  patch_script = Bootstrap::LoadMathScript(true);
+  error = math_lib.Patch(patch_script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
+  const Script& isolate_script = Script::Handle(
+      Bootstrap::LoadIsolateScript(false));
   Library::InitIsolateLibrary(isolate);
   const Library& isolate_lib = Library::Handle(Library::IsolateLibrary());
   ASSERT(!isolate_lib.IsNull());
   error = Bootstrap::Compile(isolate_lib, isolate_script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  const Script& mirrors_script = Script::Handle(Bootstrap::LoadMirrorsScript());
+  patch_script = Bootstrap::LoadIsolateScript(true);
+  error = isolate_lib.Patch(patch_script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
+  const Script& mirrors_script = Script::Handle(
+      Bootstrap::LoadMirrorsScript(false));
   Library::InitMirrorsLibrary(isolate);
   const Library& mirrors_lib = Library::Handle(Library::MirrorsLibrary());
   ASSERT(!mirrors_lib.IsNull());
   error = Bootstrap::Compile(mirrors_lib, mirrors_script);
   if (!error.IsNull()) {
     return error.raw();
   }
+  patch_script = Bootstrap::LoadMirrorsScript(true);
+  error = mirrors_lib.Patch(patch_script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
   Bootstrap::SetupNativeResolver();
 
   // Remove the Object superclass cycle by setting the super type to null (not
   // to the type of null).
   cls = object_store->object_class();
   cls.set_super_type(Type::Handle());
 
   ClassFinalizer::VerifyBootstrapClasses();
   return Error::null();
 }
@@ skipping 5343 matching lines @@
     lib ^= libs.At(i);
     error_message = lib.FindDuplicateDefinition();
     if (!error_message.IsNull()) {
       return error_message.raw();
     }
   }
   return String::null();
 }
 
 
-RawError* Library::Patch(const String& url, const String& source) const {
-  const Script& script = Script::Handle(
-      Script::New(url, source, RawScript::kPatchTag));
+RawError* Library::Patch(const Script& script) const {
+  ASSERT(script.kind() == RawScript::kPatchTag);
   return Compiler::Compile(*this, script);
 }
 
 
 bool Library::IsKeyUsed(intptr_t key) {
   intptr_t lib_key;
   const GrowableObjectArray& libs = GrowableObjectArray::Handle(
       Isolate::Current()->object_store()->libraries());
   Library& lib = Library::Handle();
   String& lib_url = String::Handle();
@@ skipping 4843 matching lines @@
 const char* JSRegExp::ToCString() const {
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart