objc4-781.2.tar.gz

diff --git a/runtime/objc-runtime-new.mm b/runtime/objc-runtime-new.mm
index ee1212714af93e80be07e90f1aeedd0581f233e4..e1583755a6f1c46ad36cec4d93989cd13f2aee83 100644 (file)
--- a/runtime/objc-runtime-new.mm
+++ b/runtime/objc-runtime-new.mm
@@ -5604,7 +5604,9 @@ objc_class::demangledName(bool needsLock)
 
     // Return previously demangled name if available.
     if (isRealized()  ||  isFuture()) {
 
     // Return previously demangled name if available.
     if (isRealized()  ||  isFuture()) {

-        if (!isAnySwift()) {
+        // Swift metaclasses don't have the is-Swift bit.
+        // We can't take this shortcut for them.
+        if (!isMetaClass() && !isAnySwift()) {

             return data()->ro()->name;
         }
         auto rwe = data()->ext();
             return data()->ro()->name;
         }
         auto rwe = data()->ext();

diff --git a/test/runtime.m b/test/runtime.m
index ec8fda8b7776ee294bc45eeedd7668269971b978..50bd68c04aff91f23f20020f44306281f607966d 100644 (file)
--- a/test/runtime.m
+++ b/test/runtime.m
@@ -212,6 +212,14 @@ int main()
     testassert(list2[count] == NULL);
     free(list2);
     free(objc_copyClassList(NULL));
     testassert(list2[count] == NULL);
     free(list2);
     free(objc_copyClassList(NULL));

+    
+    // Make sure metaclasses get demangled too.
+    testassert(strcmp(class_getName([TestRoot class]), class_getName(object_getClass([TestRoot class]))) == 0);
+    testassert(strcmp(class_getName([Sub class]), class_getName(object_getClass([Sub class]))) == 0);
+    testassert(strcmp(class_getName([SwiftV1Class class]), class_getName(object_getClass([SwiftV1Class class]))) == 0);
+    testassert(strcmp(class_getName([SwiftV1Class2 class]), class_getName(object_getClass([SwiftV1Class2 class]))) == 0);
+    testassert(strcmp(class_getName([SwiftV1Class3 class]), class_getName(object_getClass([SwiftV1Class3 class]))) == 0);
+    testassert(strcmp(class_getName([SwiftV1Class4 class]), class_getName(object_getClass([SwiftV1Class4 class]))) == 0);

 
     succeed(__FILE__);
 }
 
     succeed(__FILE__);
 }