Merge pull request #67972 from jckarter/revert-abstractstoragedecl-originally-defined-in-check

Revert "AST: Spot fix for AbstractStorageDecl::isResilient()"

Author: jckarter

lib/AST/Decl.cpp

@@ -2810,26 +2810,13 @@ bool AbstractStorageDecl::isResilient() const {
   return getModuleContext()->isResilient();
 }
 
-static bool isOriginallyDefinedIn(const Decl *D, const ModuleDecl* MD) {
-  if (!MD)
-    return false;
-  if (D->getAlternateModuleName().empty())
-    return false;
-  return D->getAlternateModuleName() == MD->getName().str();
-}
-
 bool AbstractStorageDecl::isResilient(ModuleDecl *M,
                                       ResilienceExpansion expansion) const {
   switch (expansion) {
   case ResilienceExpansion::Minimal:
     return isResilient();
   case ResilienceExpansion::Maximal:
-    // We consider this decl belongs to the module either it's currently
-    // defined in this module or it's originally defined in this module, which
-    // is specified by @_originallyDefinedIn
-    return (M != getModuleContext() &&
-            !isOriginallyDefinedIn(this, M) &&
-            isResilient());
+    return M != getModuleContext() && isResilient();
   }
   llvm_unreachable("bad resilience expansion");
 }
@@ -4782,6 +4769,14 @@ DestructorDecl *NominalTypeDecl::getValueTypeDestructor() {
   return cast<DestructorDecl>(found[0]);
 }
 
+static bool isOriginallyDefinedIn(const Decl *D, const ModuleDecl* MD) {
+  if (!MD)
+    return false;
+  if (D->getAlternateModuleName().empty())
+    return false;
+  return D->getAlternateModuleName() == MD->getName().str();
+}
+
 bool NominalTypeDecl::isResilient(ModuleDecl *M,
                                   ResilienceExpansion expansion) const {
   switch (expansion) {
@@ -4791,9 +4786,8 @@ bool NominalTypeDecl::isResilient(ModuleDecl *M,
     // We consider this decl belongs to the module either it's currently
     // defined in this module or it's originally defined in this module, which
     // is specified by @_originallyDefinedIn
-    return (M != getModuleContext() &&
-            !isOriginallyDefinedIn(this, M) &&
-            isResilient());
+    return M != getModuleContext() && !isOriginallyDefinedIn(this, M) &&
+      isResilient();
   }
   llvm_unreachable("bad resilience expansion");
 }

test/SILGen/Inputs/library_evolution_property_originally_defined_in_current_module_NewModule.swift

@@ -0,0 +1,11 @@
+@available(macOS 10.15, *)
+@_originallyDefinedIn(module: "OldModule", macOS 12.0)
+public struct OldModuleType {
+    public let value: UInt32
+
+    public static let property = OldModuleType(value: 0xFFFF_FFFF)
+
+    public init(value: UInt32) {
+      self.value = value
+    }
+}

test/SILGen/library_evolution_property_originally_defined_in_current_module.swift

@@ -0,0 +1,23 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -enable-library-evolution -module-name NewModule -emit-module-path %t/NewModule.swiftmodule -emit-module %S/Inputs/library_evolution_property_originally_defined_in_current_module_NewModule.swift
+// RUN: %target-swift-frontend -target %target-cpu-apple-macos12 -I %t -module-name OldModule -emit-silgen %s | %FileCheck %s
+
+// REQUIRES: OS=macosx
+
+import NewModule
+
+@inline(never)
+public func use2<T>(_ t: T) {
+    print(t)
+}
+
+// CHECK-NOT: @{{.*}}8property{{.*}}vau :
+
+public func use() {
+    // We should access `OldModuleType.property` via its getter exported from
+    // NewModule, even though it was _originallyDefinedIn our module.
+    // CHECK: function_ref @{{.*}}8property{{.*}}vgZ :
+    use2(OldModuleType.property)
+    print(OldModuleType.property)
+}
+// CHECK-NOT: @{{.*}}8property{{.*}}vau :