complete backport

objc/objc-api.h

@@ -550,7 +550,7 @@ class_get_meta_class(Class _class)
 static inline Class
 class_get_super_class(Class _class)
 {
-  if (!CLS_ISRESOLV(cls))
+  if (!CLS_ISRESOLV(_class))
     {
       /* This class is not yet resolved ... so lookup superclass by name.
        * We need to allow for this case because we might doing a lookup in
@@ -558,9 +558,9 @@ class_get_super_class(Class _class)
        * which might have ivars or methods added after this call (so we
        * mustn't resolve this class now).
        */
-      return (Class)objc_getClass((const char*)cls->super_class);
+      return (Class)objc_get_class((const char*)_class->super_class);
     }
-  return cls->super_class;
+  return _class->super_class;
 }
 
 static inline int