ClassMirror.mixin

runtime/lib/mirrors.cc

Index: runtime/lib/mirrors.cc
diff --git a/runtime/lib/mirrors.cc b/runtime/lib/mirrors.cc
index 7ab68b6a0c650a8e397e785e62f31e4daa7eccca..d0df08e1f415fd2e3b77cc5ff6459ee13bc1f5de 100644
--- a/runtime/lib/mirrors.cc
+++ b/runtime/lib/mirrors.cc
@@ -203,7 +203,9 @@ static RawInstance* CreateClassMirror(const Class& cls,
   const Array& args = Array::Handle(Array::New(4));
   args.SetAt(0, MirrorReference::Handle(MirrorReference::New(cls)));
   args.SetAt(1, type);
-  args.SetAt(2, String::Handle(cls.UserVisibleName()));
+  if (Type::Handle(cls.mixin()).IsNull()) {
+     args.SetAt(2, String::Handle(cls.UserVisibleName()));
+  }
   args.SetAt(3, is_generic);
   return CreateMirror(Symbols::_LocalClassMirrorImpl(), args);
 }
@@ -459,6 +461,13 @@ DEFINE_NATIVE_ENTRY(ClassMirror_interfaces, 1) {
 }
 
 
+DEFINE_NATIVE_ENTRY(ClassMirror_mixin, 1) {
+  GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
+  const Class& klass = Class::Handle(ref.GetClassReferent());
+  return klass.mixin();
+}
+
+
 DEFINE_NATIVE_ENTRY(ClassMirror_members, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance,
                                owner_mirror,