Update test

Author: elsh

lib/SIL/Verifier/SILVerifier.cpp

@@ -2451,7 +2451,7 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
     // from a fragile function is an error.
     if (!F.isNotSerialized()) {
       require((SingleFunction && RefF->isExternalDeclaration()) ||
-              RefF->hasValidLinkageForFragileRef(),
+              RefF->hasValidLinkageForFragileRef(F.getSerializedKind()),
               "function_ref inside fragile function cannot "
               "reference a private or hidden symbol");
     }

lib/SILOptimizer/IPO/CrossModuleOptimization.cpp

@@ -319,7 +319,8 @@ bool CrossModuleOptimization::canSerializeFunction(
       return false;
   }
 
-  if (isSerializedWithRightKind(M, function)) {
+  if (function->isSerialized() ||
+      isSerializedWithRightKind(M, function)) {
     canSerializeFlags[function] = true;
     return true;
   }
@@ -616,6 +617,8 @@ void CrossModuleOptimization::serializeFunction(SILFunction *function,
   if (function->isSerialized())
     return;
 
+  // If not, check whether it was serialized with
+  // this optimization.
   if (isSerializedWithRightKind(M, function))
     return;
 

test/SILOptimizer/package-cmo-resilient-mode.swift

@@ -30,8 +30,6 @@
 // RUN: %target-build-swift -module-name=Main -package-name Pkg -I%t -emit-sil -O %t/main.swift -o %t/Main-non-res.sil
 // RUN: %FileCheck %s --check-prefixes=CHECK-MAIN-COMMON,CHECK-MAIN-NONRES < %t/Main-non-res.sil
 
-// FIXME: temp disable this test; re-enable
-// REQUIRES: rdar999888777
 // REQUIRES: swift_in_compiler
 
 //--- main.swift

test/SILOptimizer/package-cmo-serialize-tables.swift

@@ -505,7 +505,7 @@ package func runPkg(_ arg: [any PkgProto]) {
   print(arg)
 }
 
-//CHECK-LABEL: sil_vtable [serialized_for_package] ParentPubKlass {
+//CHECK-LABEL: sil_vtable [serialized] ParentPubKlass {
 //CHECK-NEXT:  #ParentPubKlass.parentPubVar!getter: (ParentPubKlass) -> () -> Int : @$s3Lib14ParentPubKlassC06parentC3VarSivg
 //CHECK-NEXT:  #ParentPubKlass.parentPubVar!setter: (ParentPubKlass) -> (Int) -> () : @$s3Lib14ParentPubKlassC06parentC3VarSivs
 //CHECK-NEXT:  #ParentPubKlass.parentPubVar!modify: (ParentPubKlass) -> () -> () : @$s3Lib14ParentPubKlassC06parentC3VarSivM
@@ -526,7 +526,7 @@ package func runPkg(_ arg: [any PkgProto]) {
 //CHECK-NEXT:  #PubKlass.pubFunc: (PubKlass) -> () -> () : @$s3Lib8PubKlassC7pubFuncyyF
 //CHECK-NEXT:  #PubKlass.deinit!deallocator: @$s3Lib8PubKlassCfD
 
-//CHECK-LABEL: sil_vtable [serialized_for_package] ParentPubKlassWithInternalMemberX {
+//CHECK-LABEL: sil_vtable [serialized] ParentPubKlassWithInternalMemberX {
 //CHECK-NEXT:  #ParentPubKlassWithInternalMemberX.parentPubVar!getter: (ParentPubKlassWithInternalMemberX) -> () -> Int : @$s3Lib33ParentPubKlassWithInternalMemberXC06parentC3VarSivg
 //CHECK-NEXT:  #ParentPubKlassWithInternalMemberX.parentPubVar!setter: (ParentPubKlassWithInternalMemberX) -> (Int) -> () : @$s3Lib33ParentPubKlassWithInternalMemberXC06parentC3VarSivs
 //CHECK-NEXT:  #ParentPubKlassWithInternalMemberX.parentPubVar!modify: (ParentPubKlassWithInternalMemberX) -> () -> () : @$s3Lib33ParentPubKlassWithInternalMemberXC06parentC3VarSivM
@@ -549,7 +549,7 @@ package func runPkg(_ arg: [any PkgProto]) {
 //CHECK-NEXT:  #PubKlassX.pubFunc: (PubKlassX) -> () -> () : @$s3Lib9PubKlassXC7pubFuncyyF 
 //CHECK-NEXT:  #PubKlassX.deinit!deallocator: @$s3Lib9PubKlassXCfD
 
-//CHECK-LABEL: sil_vtable [serialized_for_package] ParentPubKlassWithInternalMemberY {
+//CHECK-LABEL: sil_vtable [serialized] ParentPubKlassWithInternalMemberY {
 //CHECK-NEXT:  #ParentPubKlassWithInternalMemberY.init!allocator: (ParentPubKlassWithInternalMemberY.Type) -> (Int) -> ParentPubKlassWithInternalMemberY : @$s3Lib33ParentPubKlassWithInternalMemberYCyACSicfC
 //CHECK-NEXT:  #ParentPubKlassWithInternalMemberY.deinit!deallocator: @$s3Lib33ParentPubKlassWithInternalMemberYCfD