Index: runtime/vm/raw_object.h |
=================================================================== |
--- runtime/vm/raw_object.h (revision 34480) |
+++ 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 { |