Clean up

Author: elsh

lib/AST/Decl.cpp

@@ -2514,9 +2514,9 @@ static bool isDirectToStorageAccess(const DeclContext *UseDC,
 
   // If the storage is resilient, we cannot access it directly at all.
   if (var->isResilient(UseDC->getParentModule(),
-                       UseDC->getResilienceExpansion())) {
-    return (var->getModuleContext()->getBypassResilience());
-  }
+                       UseDC->getResilienceExpansion()))
+    return var->getModuleContext()->getBypassResilience();
+
   if (isa<ConstructorDecl>(AFD) || isa<DestructorDecl>(AFD)) {
     // The access must also be a member access on 'self' in all language modes.
     if (!isAccessOnSelf)
@@ -2978,8 +2978,9 @@ bool AbstractStorageDecl::isResilient(ModuleDecl *M,
   case ResilienceExpansion::Minimal:
     return isResilient();
   case ResilienceExpansion::Maximal:
-    if (getModuleContext() == M)
+    if (M == getModuleContext())
       return false;
+    // Non-resilient if bypass optimization in package is enabled
     if (bypassResilienceInPackage(M))
       return false;
     return isResilient();
@@ -5083,7 +5084,7 @@ bool NominalTypeDecl::isResilient(ModuleDecl *M,
   case ResilienceExpansion::Maximal:
     // We can access declarations from the same module
     // non-resiliently in a maximal context.
-    if (getModuleContext() == M)
+    if (M == getModuleContext())
       return false;
     // Non-resilient if bypass optimization in package is enabled
     if (bypassResilienceInPackage(M))

lib/IRGen/GenDecl.cpp

@@ -5979,7 +5979,6 @@ bool IRGenModule::isResilient(NominalTypeDecl *D,
 
   if (D->getModuleContext()->getBypassResilience())
     return false;
-
   if (expansion == ResilienceExpansion::Maximal &&
       Types.getLoweringMode() == TypeConverter::Mode::CompletelyFragile) {
     return false;

lib/SIL/Verifier/SILVerifier.cpp

@@ -122,11 +122,6 @@ namespace {
 template <typename DeclType>
 bool checkResilience(DeclType *D, ModuleDecl *M,
                      ResilienceExpansion expansion) {
-//  auto acl = D->getFormalAccessScope(/*useDC=*/nullptr,
-//                                     /*treatUsableFromInlineAsPublic=*/true);
-//  if (D->getDeclContext()->bypassResilienceInPackage(acl.isPackage()))
-//    return false;
-
   return !D->getModuleContext()->getBypassResilience() &&
          D->isResilient(M, expansion);
 }

test/IRGen/Inputs/package_types/resilient_struct.swift

@@ -1,8 +1,3 @@
-package struct Star {
-  package var planet: Int = 123
-  package init() {}
-}
-
 package struct Point {
   package var x: Int // read-write stored property
   package let y: Int // read-only stored property

test/IRGen/package_resilience.swift

@@ -60,18 +60,13 @@ package final class ClassWithResilientProperty {
   package let p: Point
   package let s: Size
   package let color: Int32
-  package let px: Int
 
   package init(p: Point, s: Size, color: Int32) {
     self.p = p
-    self.px = p.x
     self.s = s
     self.color = color
 
   }
-  func foo(p: Point) -> Int {
-    return p.x + 31
-  }
 }