Merge pull request #41337 from eeckstein/cmo-fixes

two small fixes for cross-module-optimization

Author: eeckstein

lib/SILOptimizer/IPO/CrossModuleOptimization.cpp

@@ -248,6 +248,12 @@ bool CrossModuleOptimization::canSerializeInstruction(SILInstruction *inst,
     if (!callee)
       return false;
 
+    // In conservative mode we don't want to turn non-public functions into
+    // public functions, because that can increase code size. E.g. if the
+    // function is completely inlined afterwards.
+    if (conservative && !hasPublicVisibility(callee->getLinkage()))
+      return false;
+
     // Recursivly walk down the call graph.
     if (canSerializeFunction(callee, canSerializeFlags, maxDepth - 1))
       return true;
@@ -260,12 +266,12 @@ bool CrossModuleOptimization::canSerializeInstruction(SILInstruction *inst,
     if (!canUseFromInline(callee))
       return false;
 
-    // In conservative mode we don't want to turn non-public functions into
-    // public functions, because that can increase code size. E.g. if the
-    // function is completely inlined afterwards.
-    if (conservative && callee->getLinkage() != SILLinkage::Public)
+    return true;
+  }
+  if (auto *GAI = dyn_cast<GlobalAddrInst>(inst)) {
+    SILGlobalVariable *global = GAI->getReferencedGlobal();
+    if (conservative && !hasPublicVisibility(global->getLinkage()))
       return false;
-
     return true;
   }
   if (auto *KPI = dyn_cast<KeyPathInst>(inst)) {
@@ -457,7 +463,7 @@ void CrossModuleOptimization::serializeInstruction(SILInstruction *inst,
     if (canSerializeGlobal(global)) {
       serializeGlobal(global);
     }
-    if (global->getLinkage() != SILLinkage::Public) {
+    if (!hasPublicVisibility(global->getLinkage())) {
       global->setLinkage(SILLinkage::Public);
       M.addPublicCMOSymbol(global->getName());
     }

test/SILOptimizer/Inputs/cross-module/cross-module.swift

@@ -290,3 +290,7 @@ public struct StructWithClosure {
   public static let c = { (x: Int) -> Int in return x }
 }
 
+public func getEmptySet() -> Set<Int> {
+  return Set()
+}
+

test/SILOptimizer/cross-module-optimization.swift

@@ -27,6 +27,7 @@
 
 import Test
 
+// CHECK-SIL: sil_global public_external [serialized] @_swiftEmptySetSingleton : $_SwiftEmptySetSingleton
 
 func testNestedTypes() {
   let c = Container()
@@ -132,6 +133,9 @@ func testMisc() {
 
   // CHECK-OUTPUT: 27
   print(classWithPublicProperty(33))
+
+  // CHECK-OUTPUT: []
+  print(getEmptySet())
 }
 
 // CHECK-SIL2-LABEL: sil hidden [noinline] @$s4Main10testGlobalyyF