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

Unified Diff: runtime/vm/raw_object.h

Issue 216383004: Merge initial implementation of deferred handling in the VM: (Closed) Base URL: http://dart.googlecode.com/svn/trunk/dart/
Patch Set: Created 6 years, 9 months 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 | « runtime/vm/parser.cc ('k') | runtime/vm/raw_object_snapshot.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/raw_object.h
===================================================================
--- runtime/vm/raw_object.h (revision 34495)
+++ runtime/vm/raw_object.h (working copy)
@@ -26,7 +26,6 @@
V(TokenStream) \
V(Script) \
V(Library) \
- V(LibraryPrefix) \
V(Namespace) \
V(Code) \
V(Instructions) \
@@ -46,6 +45,7 @@
V(UnhandledException) \
V(UnwindError) \
V(Instance) \
+ V(LibraryPrefix) \
V(AbstractType) \
V(Type) \
V(TypeRef) \
@@ -782,19 +782,6 @@
};
-class RawLibraryPrefix : public RawObject {
- RAW_HEAP_OBJECT_IMPLEMENTATION(LibraryPrefix);
-
- RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
- RawString* name_; // library prefix name.
- RawArray* imports_; // libraries imported with this prefix.
- RawObject** to() {
- return reinterpret_cast<RawObject**>(&ptr()->imports_);
- }
- intptr_t num_imports_; // Number of library entries in libraries_.
-};
-
-
class RawNamespace : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Namespace);
@@ -1136,6 +1123,23 @@
};
+class RawLibraryPrefix : public RawInstance {
+ RAW_HEAP_OBJECT_IMPLEMENTATION(LibraryPrefix);
+
+ RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
+ RawString* name_; // Library prefix name.
+ RawArray* imports_; // Libraries imported with this prefix.
+ RawArray* dependent_code_; // Code that refers to deferred, unloaded
+ // library prefix.
+ RawObject** to() {
+ return reinterpret_cast<RawObject**>(&ptr()->dependent_code_);
+ }
+ intptr_t num_imports_; // Number of library entries in libraries_.
+ bool is_deferred_load_;
+ bool is_loaded_;
+};
+
+
class RawAbstractType : public RawInstance {
protected:
enum TypeState {
« no previous file with comments | « runtime/vm/parser.cc ('k') | runtime/vm/raw_object_snapshot.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698