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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/lib/mirrors.cc

Issue 1095903002: Deal with deferred loading in the VM mirrors. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 8 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 | « pkg/compiler/lib/src/mirrors/source_mirrors.dart ('k') | runtime/lib/mirrors_impl.dart » ('j') | sdk/lib/mirrors/mirrors.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/lib/mirrors.cc
diff --git a/runtime/lib/mirrors.cc b/runtime/lib/mirrors.cc
index 0b790a78e68d7b3226060756f4582ef1dd8d2c7c..433d12f5b1cacc2c550171c1cb9ebb21a16689d5 100644
--- a/runtime/lib/mirrors.cc
+++ b/runtime/lib/mirrors.cc
@@ -18,6 +18,11 @@
namespace dart {
+#define PROPOGATE_IF_MALFOMRED(type) \
+ ({ if (type.IsMalformed()) { \
+ Exceptions::PropagateError(Error::Handle(type.error())); \
+ } }) \
siva 2015/04/22 17:28:00 why is the formatting done this way instead of jus
rmacnak 2015/04/22 18:05:44 I copied from a macro that was using its return va
+
static RawInstance* CreateMirror(const String& mirror_class_name,
const Array& constructor_arguments) {
const Library& mirrors_lib = Library::Handle(Library::MirrorsLibrary());
@@ -205,7 +210,7 @@ static RawInstance* CreateTypeVariableList(const Class& cls) {
for (intptr_t i = 0; i < args.Length(); i++) {
type ^= args.TypeAt(i);
ASSERT(type.IsTypeParameter());
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
ASSERT(type.IsFinalized());
name ^= type.name();
result.SetAt(2 * i, name);
@@ -382,7 +387,7 @@ static RawInstance* CreateCombinatorMirror(const Object& identifiers,
static RawInstance* CreateLibraryDependencyMirror(const Instance& importer,
const Namespace& ns,
- const String& prefix,
+ const LibraryPrefix& prefix,
const bool is_import,
const bool is_deferred) {
const Library& importee = Library::Handle(ns.library());
@@ -419,9 +424,10 @@ static RawInstance* CreateLibraryDependencyMirror(const Instance& importer,
const Array& args = Array::Handle(Array::New(7));
args.SetAt(0, importer);
- args.SetAt(1, importee_mirror);
+ args.SetAt(1, importee.Loaded() ? importee_mirror : prefix);
args.SetAt(2, combinators);
- args.SetAt(3, prefix);
+ args.SetAt(3, prefix.IsNull() ? Object::null_object()
+ : String::Handle(prefix.name()));
args.SetAt(4, Bool::Get(is_import));
args.SetAt(5, Bool::Get(is_deferred));
args.SetAt(6, metadata);
@@ -429,6 +435,17 @@ static RawInstance* CreateLibraryDependencyMirror(const Instance& importer,
}
+DEFINE_NATIVE_ENTRY(LibraryMirror_fromPrefix, 1) {
+ GET_NON_NULL_NATIVE_ARGUMENT(LibraryPrefix, prefix,
+ arguments->NativeArgAt(0));
+ const Library& deferred_lib = Library::Handle(prefix.GetLibrary(0));
+ if (!deferred_lib.Loaded()) {
+ return Instance::null();
+ }
+ return CreateLibraryMirror(deferred_lib);
+}
+
+
DEFINE_NATIVE_ENTRY(LibraryMirror_libraryDependencies, 2) {
GET_NON_NULL_NATIVE_ARGUMENT(Instance, lib_mirror, arguments->NativeArgAt(0));
GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
@@ -437,7 +454,7 @@ DEFINE_NATIVE_ENTRY(LibraryMirror_libraryDependencies, 2) {
Array& ports = Array::Handle();
Namespace& ns = Namespace::Handle();
Instance& dep = Instance::Handle();
- String& prefix = String::Handle();
+ LibraryPrefix& prefix = LibraryPrefix::Handle();
GrowableObjectArray& deps =
GrowableObjectArray::Handle(GrowableObjectArray::New());
@@ -469,14 +486,13 @@ DEFINE_NATIVE_ENTRY(LibraryMirror_libraryDependencies, 2) {
while (entries.HasNext()) {
entry = entries.GetNext();
if (entry.IsLibraryPrefix()) {
- const LibraryPrefix& lib_prefix = LibraryPrefix::Cast(entry);
- prefix = lib_prefix.name();
- ports = lib_prefix.imports();
+ prefix ^= entry.raw();
+ ports = prefix.imports();
for (intptr_t i = 0; i < ports.Length(); i++) {
ns ^= ports.At(i);
if (!ns.IsNull()) {
dep = CreateLibraryDependencyMirror(lib_mirror, ns, prefix, true,
- lib_prefix.is_deferred_load());
+ prefix.is_deferred_load());
if (!dep.IsNull()) {
deps.Add(dep);
}
@@ -488,6 +504,7 @@ DEFINE_NATIVE_ENTRY(LibraryMirror_libraryDependencies, 2) {
return deps.raw();
}
+
static RawInstance* CreateTypeMirror(const AbstractType& type) {
if (type.IsTypeRef()) {
AbstractType& ref_type = AbstractType::Handle(TypeRef::Cast(type).type());
@@ -496,19 +513,18 @@ static RawInstance* CreateTypeMirror(const AbstractType& type) {
return CreateTypeMirror(ref_type);
}
ASSERT(type.IsFinalized());
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
+
if (type.HasResolvedTypeClass()) {
const Class& cls = Class::Handle(type.type_class());
// Handle void and dynamic types.
if (cls.IsVoidClass()) {
Array& args = Array::Handle(Array::New(1));
args.SetAt(0, Symbols::Void());
- // TODO(mlippautz): Create once in the VM isolate and retrieve from there.
return CreateMirror(Symbols::_SpecialTypeMirror(), args);
} else if (cls.IsDynamicClass()) {
Array& args = Array::Handle(Array::New(1));
args.SetAt(0, Symbols::Dynamic());
- // TODO(mlippautz): Create once in the VM isolate and retrieve from there.
return CreateMirror(Symbols::_SpecialTypeMirror(), args);
}
return CreateClassMirror(cls, type, Bool::False(), Object::null_instance());
@@ -540,34 +556,6 @@ static RawInstance* CreateIsolateMirror() {
}
-static RawInstance* CreateMirrorSystem() {
- Isolate* isolate = Isolate::Current();
- const GrowableObjectArray& libraries = GrowableObjectArray::Handle(
- isolate, isolate->object_store()->libraries());
-
- const intptr_t num_libraries = libraries.Length();
- const GrowableObjectArray& library_mirrors = GrowableObjectArray::Handle(
- isolate, GrowableObjectArray::New(num_libraries));
- Library& library = Library::Handle(isolate);
- Instance& library_mirror = Instance::Handle(isolate);
-
- for (int i = 0; i < num_libraries; i++) {
- library ^= libraries.At(i);
- library_mirror = CreateLibraryMirror(library);
- if (!library_mirror.IsNull()) {
- library_mirrors.Add(library_mirror);
- }
- }
-
- const Instance& isolate_mirror = Instance::Handle(CreateIsolateMirror());
-
- const Array& args = Array::Handle(Array::New(2));
- args.SetAt(0, library_mirrors);
- args.SetAt(1, isolate_mirror);
- return CreateMirror(Symbols::_LocalMirrorSystem(), args);
-}
-
-
static RawInstance* ReturnResult(const Object& result) {
if (result.IsError()) {
Exceptions::PropagateError(Error::Cast(result));
@@ -748,7 +736,7 @@ static RawInstance* InvokeInstanceGetter(const Class& klass,
static RawAbstractType* InstantiateType(const AbstractType& type,
const AbstractType& instantiator) {
ASSERT(type.IsFinalized());
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
if (type.IsInstantiated() || instantiator.IsNull()) {
return type.Canonicalize();
@@ -756,7 +744,7 @@ static RawAbstractType* InstantiateType(const AbstractType& type,
ASSERT(!instantiator.IsNull());
ASSERT(instantiator.IsFinalized());
- ASSERT(!instantiator.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(instantiator);
const TypeArguments& type_args =
TypeArguments::Handle(instantiator.arguments());
@@ -772,14 +760,35 @@ static RawAbstractType* InstantiateType(const AbstractType& type,
}
-DEFINE_NATIVE_ENTRY(Mirrors_makeLocalMirrorSystem, 0) {
- return CreateMirrorSystem();
+DEFINE_NATIVE_ENTRY(MirrorSystem_libraries, 0) {
+ const GrowableObjectArray& libraries = GrowableObjectArray::Handle(
+ isolate, isolate->object_store()->libraries());
+
+ const intptr_t num_libraries = libraries.Length();
+ const GrowableObjectArray& library_mirrors = GrowableObjectArray::Handle(
+ isolate, GrowableObjectArray::New(num_libraries));
+ Library& library = Library::Handle(isolate);
+ Instance& library_mirror = Instance::Handle(isolate);
+
+ for (int i = 0; i < num_libraries; i++) {
+ library ^= libraries.At(i);
+ library_mirror = CreateLibraryMirror(library);
+ if (!library_mirror.IsNull() && library.Loaded()) {
+ library_mirrors.Add(library_mirror);
+ }
+ }
+ return library_mirrors.raw();
+}
+
+
+DEFINE_NATIVE_ENTRY(MirrorSystem_isolate, 0) {
+ return CreateIsolateMirror();
}
DEFINE_NATIVE_ENTRY(Mirrors_makeLocalClassMirror, 1) {
GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, type, arguments->NativeArgAt(0));
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
ASSERT(type.IsFinalized());
ASSERT(type.HasResolvedTypeClass());
const Class& cls = Class::Handle(type.type_class());
@@ -904,7 +913,7 @@ DEFINE_NATIVE_ENTRY(ClassMirror_library, 1) {
DEFINE_NATIVE_ENTRY(ClassMirror_supertype, 1) {
GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, type, arguments->NativeArgAt(0));
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
ASSERT(type.IsFinalized());
if (!type.HasResolvedTypeClass()) {
Exceptions::ThrowArgumentError(type);
@@ -919,7 +928,7 @@ DEFINE_NATIVE_ENTRY(ClassMirror_supertype, 1) {
DEFINE_NATIVE_ENTRY(ClassMirror_supertype_instantiated, 1) {
GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, type, arguments->NativeArgAt(0));
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
ASSERT(type.IsFinalized());
if (!type.HasResolvedTypeClass()) {
Exceptions::ThrowArgumentError(type);
@@ -933,7 +942,7 @@ DEFINE_NATIVE_ENTRY(ClassMirror_supertype_instantiated, 1) {
DEFINE_NATIVE_ENTRY(ClassMirror_interfaces, 1) {
GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, type, arguments->NativeArgAt(0));
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
ASSERT(type.IsFinalized());
if (!type.HasResolvedTypeClass()) {
Exceptions::ThrowArgumentError(type);
@@ -950,7 +959,7 @@ DEFINE_NATIVE_ENTRY(ClassMirror_interfaces, 1) {
DEFINE_NATIVE_ENTRY(ClassMirror_interfaces_instantiated, 1) {
GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, type, arguments->NativeArgAt(0));
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
ASSERT(type.IsFinalized());
if (!type.HasResolvedTypeClass()) {
Exceptions::ThrowArgumentError(type);
@@ -978,7 +987,7 @@ DEFINE_NATIVE_ENTRY(ClassMirror_interfaces_instantiated, 1) {
DEFINE_NATIVE_ENTRY(ClassMirror_mixin, 1) {
GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, type, arguments->NativeArgAt(0));
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
ASSERT(type.IsFinalized());
if (!type.HasResolvedTypeClass()) {
Exceptions::ThrowArgumentError(type);
@@ -996,7 +1005,7 @@ DEFINE_NATIVE_ENTRY(ClassMirror_mixin_instantiated, 2) {
GET_NON_NULL_NATIVE_ARGUMENT(AbstractType,
instantiator,
arguments->NativeArgAt(1));
- ASSERT(!type.IsMalformed());
+ PROPOGATE_IF_MALFOMRED(type);
ASSERT(type.IsFinalized());
if (!type.HasResolvedTypeClass()) {
Exceptions::ThrowArgumentError(type);
« no previous file with comments | « pkg/compiler/lib/src/mirrors/source_mirrors.dart ('k') | runtime/lib/mirrors_impl.dart » ('j') | sdk/lib/mirrors/mirrors.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698