Merge pull request #24637 from mikeash/self-awareness-class-struggle-5.1

[5.1][Runtime] Avoid +class overrides when initializing an ObjC class.

Author: mikeash

stdlib/public/runtime/SwiftObject.mm

@@ -1269,7 +1269,11 @@ id swift_dynamicCastObjCProtocolConditional(id object,
   // Used when we have class metadata and we want to ensure a class has been
   // initialized by the Objective-C runtime. We need to do this because the
   // class "c" might be valid metadata, but it hasn't been initialized yet.
-  return [c class];
+  // Send a message that's likely not to be overridden to minimize potential
+  // side effects. Ignore the return value in case it is overridden to
+  // return something different. See SR-10463 for an example.
+  [c self];
+  return c;
 }
 
 static const ClassMetadata *

test/stdlib/Inputs/ObjCEvilClassInitialization/EvilClass.h

@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+
+// A class that overrides +class and +self to return nil.
+@interface EvilClass: NSObject
+@end

test/stdlib/Inputs/ObjCEvilClassInitialization/EvilClass.m

@@ -0,0 +1,8 @@
+#import "EvilClass.h"
+
+@implementation EvilClass
+
++ (Class)class { return nil; }
++ (id)self { return nil; }
+
+@end

test/stdlib/Inputs/ObjCEvilClassInitialization/module.map

@@ -0,0 +1,3 @@
+module EvilClass {
+  header "EvilClass.h"
+}

test/stdlib/ObjCEvilClassInitialization.swift

@@ -0,0 +1,25 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-clang -fobjc-arc %S/Inputs/ObjCEvilClassInitialization/EvilClass.m -c -o %t/EvilClass.o
+// RUN: %target-build-swift -I %S/Inputs/ObjCEvilClassInitialization/ %t/EvilClass.o %s -o %t/a.out
+// RUN: %target-codesign %t/a.out
+// RUN: %target-run %t/a.out
+
+// REQUIRES: executable_test
+// REQUIRES: objc_interop
+
+import EvilClass
+
+import StdlibUnittest
+
+let tests = TestSuite("ObjCEvilClassInitialization")
+
+tests.test("GenericOnEvilClass") {
+  struct Generic<T> {
+    var type: T.Type { return T.self }
+  }
+  let g = Generic<EvilClass>()
+  expectEqual("\(type(of: g))", "Generic<EvilClass>")
+  expectEqual(g.type, EvilClass.self)
+}
+
+runAllTests()