Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1791)

Unified Diff: vm/object.cc

Issue 8520030: Set the loaded_ flag in RawLibrary when it is completely loaded. This (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « vm/object.h ('k') | vm/raw_object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vm/object.cc
===================================================================
--- vm/object.cc (revision 1579)
+++ vm/object.cc (working copy)
@@ -3671,12 +3671,33 @@
void Library::SetName(const String& name) const {
// Only set name once.
- ASSERT(raw_ptr()->name_ == raw_ptr()->url_);
+ ASSERT(!Loaded());
ASSERT(name.IsSymbol());
StorePointer(&raw_ptr()->name_, name.raw());
}
+void Library::SetLoadInProgress() const {
+ // Should not be already loaded.
+ ASSERT(raw_ptr()->load_state_ == RawLibrary::kAllocated);
+ raw_ptr()->load_state_ = RawLibrary::kLoadInProgress;
+}
+
+
+void Library::SetLoaded() const {
+ // Should not be already loaded or just allocated.
+ ASSERT(LoadInProgress());
+ raw_ptr()->load_state_ = RawLibrary::kLoaded;
+}
+
+
+void Library::SetLoadError() const {
+ // Should not be already loaded or just allocated.
+ ASSERT(LoadInProgress());
+ raw_ptr()->load_state_ = RawLibrary::kLoadError;
+}
+
+
void Library::GrowDictionary(const Array& dict, intptr_t dict_size) const {
// TODO(iposva): Avoid exponential growth.
intptr_t new_dict_size = dict_size * 2;
@@ -4062,7 +4083,7 @@
result.raw_ptr()->next_registered_ = Library::null();
result.set_native_entry_resolver(NULL);
result.raw_ptr()->corelib_imported_ = true;
- result.raw_ptr()->loaded_ = false;
+ result.raw_ptr()->load_state_ = RawLibrary::kAllocated;
result.InitClassDictionary();
result.InitImportList();
result.InitImportedIntoList();
« no previous file with comments | « vm/object.h ('k') | vm/raw_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698