Merge pull request swiftlang#70115 from atrick/510-fix-let-props

[5.10] Fix LetPropertiesOpt crash on @_objcImplementation extensions

Author: atrick

lib/SILOptimizer/IPO/LetPropertiesOpts.cpp

@@ -239,7 +239,8 @@ void LetPropertiesOpt::optimizeLetPropertyAccess(VarDecl *Property,
     return;
 
   auto *Ty = dyn_cast<NominalTypeDecl>(Property->getDeclContext());
-  if (SkipTypeProcessing.count(Ty))
+  // Ty is null for properties declared inside an extension of an ObjC type.
+  if (!Ty || SkipTypeProcessing.count(Ty))
     return;
 
   LLVM_DEBUG(llvm::dbgs() << "Replacing access to property '" << *Property

test/SILOptimizer/Inputs/let_properties_opts.h

@@ -3,3 +3,5 @@
 @interface ObjcInterface: NSObject
 @end
 
+@interface ObjcInterfaceConstInit: NSObject
+@end

test/SILOptimizer/let_properties_opts_objc.swift

@@ -16,3 +16,14 @@ public func testObjcInterface(_ x: ObjcInterface) -> Int {
   return x.i
 }
 
+// Test optimization of a private constant. This constant must be declared in a separate type without other fields.
+@_objcImplementation extension ObjcInterfaceConstInit {
+  private let constant: Int = 0
+
+  // CHECK-LABEL: sil hidden @$sSo22ObjcInterfaceConstInitC4testE0E15PrivateConstantSiyF : $@convention(method) (@guaranteed ObjcInterfaceConstInit) -> Int {
+  // CHECK: ref_element_addr %0 : $ObjcInterfaceConstInit, #ObjcInterfaceConstInit.constant
+  // CHECK-LABEL: } // end sil function '$sSo22ObjcInterfaceConstInitC4testE0E15PrivateConstantSiyF'
+  final func testPrivateConstant() -> Int {
+    return constant
+  }
+}