languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-19 20:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not compile a class when the class mirror tries to access the metadata.

Browse source 
R=rmacnak@google.com

Review URL: https://codereview.chromium.org/1834673003 .
This commit is contained in:
Siva Annamalai 2016-03-28 11:16:15 -07:00
parent 3a69300644
commit 341643cb2b
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
runtime/lib/mirrors.cc
View file

@ -333,12 +333,6 @@ static RawInstance* CreateClassMirror(const Class& cls,
return CreateTypedefMirror(cls, type, is_declaration, owner_mirror);
}
const Error& error = Error::Handle(cls.EnsureIsFinalized(Thread::Current()));
if (!error.IsNull()) {
Exceptions::PropagateError(error);
UNREACHABLE();
}
const Array& args = Array::Handle(Array::New(9));
args.SetAt(0, MirrorReference::Handle(MirrorReference::New(cls)));
args.SetAt(1, type);
@ -1471,6 +1465,12 @@ DEFINE_NATIVE_ENTRY(ClassMirror_invoke, 5) {
GET_NON_NULL_NATIVE_ARGUMENT(Array, args, arguments->NativeArgAt(3));
GET_NON_NULL_NATIVE_ARGUMENT(Array, arg_names, arguments->NativeArgAt(4));
const Error& error = Error::Handle(zone, klass.EnsureIsFinalized(thread));
if (!error.IsNull()) {
Exceptions::PropagateError(error);
UNREACHABLE();
}
Function& function = Function::Handle(
klass.LookupStaticFunction(function_name));
@ -1543,6 +1543,11 @@ DEFINE_NATIVE_ENTRY(ClassMirror_invokeGetter, 3) {
// with its cousins.
GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
const Class& klass = Class::Handle(ref.GetClassReferent());
const Error& error = Error::Handle(zone, klass.EnsureIsFinalized(thread));
if (!error.IsNull()) {
Exceptions::PropagateError(error);
UNREACHABLE();
}
GET_NON_NULL_NATIVE_ARGUMENT(String, getter_name, arguments->NativeArgAt(2));
return InvokeClassGetter(klass, getter_name, true);
}
@ -1557,6 +1562,12 @@ DEFINE_NATIVE_ENTRY(ClassMirror_invokeSetter, 4) {
GET_NON_NULL_NATIVE_ARGUMENT(String, setter_name, arguments->NativeArgAt(2));
GET_NATIVE_ARGUMENT(Instance, value, arguments->NativeArgAt(3));
const Error& error = Error::Handle(zone, klass.EnsureIsFinalized(thread));
if (!error.IsNull()) {
Exceptions::PropagateError(error);
UNREACHABLE();
}
// Check for real fields and user-defined setters.
const Field& field = Field::Handle(klass.LookupStaticField(setter_name));
Function& setter = Function::Handle();
@ -1616,6 +1627,12 @@ DEFINE_NATIVE_ENTRY(ClassMirror_invokeConstructor, 5) {
GET_NON_NULL_NATIVE_ARGUMENT(Array, explicit_args, arguments->NativeArgAt(3));
GET_NON_NULL_NATIVE_ARGUMENT(Array, arg_names, arguments->NativeArgAt(4));
const Error& error = Error::Handle(zone, klass.EnsureIsFinalized(thread));
if (!error.IsNull()) {
Exceptions::PropagateError(error);
UNREACHABLE();
}
// By convention, the static function implementing a named constructor 'C'
// for class 'A' is labeled 'A.C', and the static function implementing the
// unnamed constructor for class 'A' is labeled 'A.'.

2
tests/lib/mirrors/mirror_in_static_init_test.dart
View file

@ -19,7 +19,7 @@ abstract class C {
final int staticField = () {
var lib = currentMirrorSystem().findLibrary(#mirror_in_static_init_test);
var lst = new List.from(lib.declarations.values);
var lst = new List.from(lib.declarations[#C].declarations.values);
return 42;
}();