Fix global accessor linker error in package.

When package resilience optimization is enabled, global accessor symbols
are not added to the SIL symbol list, causing a linker issue.

Resolves rdar://127321129

Author: elsh

lib/SIL/IR/SILSymbolVisitor.cpp

@@ -590,16 +590,6 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
         addFunction(declRef);
       }
 
-      // Statically/globally stored variables have some special handling.
-      if (VD->hasStorage() && isGlobalOrStaticVar(VD)) {
-        if (!shouldSkipVisit(getDeclLinkage(VD))) {
-          Visitor.addGlobalVar(VD);
-        }
-
-        if (VD->isLazilyInitializedGlobal())
-          addFunction(SILDeclRef(VD, SILDeclRef::Kind::GlobalAccessor));
-      }
-
       // Wrapped non-static member properties may have a backing initializer.
       auto initInfo = VD->getPropertyWrapperInitializerInfo();
       if (initInfo.hasInitFromWrappedValue() && !VD->isStatic()) {
@@ -608,6 +598,21 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
       }
     }
 
+    // Statically/globally stored variables have some special handling.
+    // Global accessor gets no linkage limit in the same resilience domain,
+    // e.g. in package with non-resilient access optimizations enabled,
+    // so it should be added in such case.
+    if (!VD->isResilient() ||
+        VD->getModuleContext()->allowNonResilientAccess()) {
+      if (VD->hasStorage() && isGlobalOrStaticVar(VD)) {
+        if (!shouldSkipVisit(getDeclLinkage(VD))) {
+          Visitor.addGlobalVar(VD);
+        }
+        if (VD->isLazilyInitializedGlobal())
+          addFunction(SILDeclRef(VD, SILDeclRef::Kind::GlobalAccessor));
+      }
+    }
+    
     visitAbstractStorageDecl(VD);
   }
 

lib/SILOptimizer/Mandatory/MandatoryInlining.cpp

@@ -764,6 +764,17 @@ getCalleeFunction(SILFunction *F, FullApplySite AI, bool &IsThick,
     return nullptr;
   }
 
+  // If the caller is [serialized] due to explicit `@inlinable` but
+  // the callee was [serialized_for_package] due to package-cmo, the
+  // callee is [serialized] and might contain loadable types, which
+  // is normally disallowed. This check prevents such loadable types
+  // from being inlined.
+  if (F->isSerialized() &&
+      !F->isSerializedForPackage() &&
+      CalleeFunction->isSerializedForPackage()) {
+    return nullptr;
+  }
+
   return CalleeFunction;
 }
 

test/IRGen/package_global_accessor.swift

@@ -0,0 +1,21 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-build-swift -module-name=File -package-name Pkg -I%t -emit-sil %s | %FileCheck %s --check-prefix=CHECK-SIL
+// RUN: %target-build-swift -module-name=File -package-name Pkg -I%t -emit-sil %s -enable-library-evolution | %FileCheck %s --check-prefix=CHECK-SIL-HID
+// RUN: %target-build-swift -module-name=File -package-name Pkg -I%t -emit-sil %s -enable-library-evolution -Xfrontend -experimental-allow-non-resilient-access | %FileCheck %s --check-prefix=CHECK-SIL
+// RUN: %target-build-swift -module-name=File -package-name Pkg -I%t -emit-ir %s | %FileCheck %s --check-prefix=CHECK-IR
+// RUN: %target-build-swift -module-name=File -package-name Pkg -I%t -emit-ir %s -enable-library-evolution | %FileCheck %s --check-prefix=CHECK-IR-HID
+// RUN: %target-build-swift -module-name=File -package-name Pkg -I%t -emit-ir %s -enable-library-evolution -Xfrontend -experimental-allow-non-resilient-access | %FileCheck %s --check-prefix=CHECK-IR
+
+public struct S {
+  public static var x = "hello world"
+}
+
+// S.x.unsafeMutableAddressor
+// CHECK-SIL: sil [global_init] @$s4File1SV1xSSvau : $@convention(thin) () -> Builtin.RawPointer {
+// S.x.unsafeMutableAddressor
+// CHECK-SIL-HID: sil hidden [global_init] @$s4File1SV1xSSvau : $@convention(thin) () -> Builtin.RawPointer {
+
+// CHECK-IR: define swiftcc ptr @"$s4File1SV1xSSvau"()
+// CHECK-IR-HID: define hidden swiftcc ptr @"$s4File1SV1xSSvau"()
+