Merge pull request #33528 from xymus/revert-33481

Revert "[Serialization] Serialize isUserAccessible on functions"

Author: xymus

lib/Serialization/Deserialization.cpp

@@ -2995,7 +2995,6 @@ class DeclDeserializer {
     DeclID accessorStorageDeclID;
     bool overriddenAffectsABI, needsNewVTableEntry, isTransparent;
     DeclID opaqueReturnTypeID;
-    bool isUserAccessible;
     ArrayRef<uint64_t> nameAndDependencyIDs;
 
     if (!isAccessor) {
@@ -3013,7 +3012,6 @@ class DeclDeserializer {
                                           rawAccessLevel,
                                           needsNewVTableEntry,
                                           opaqueReturnTypeID,
-                                          isUserAccessible,
                                           nameAndDependencyIDs);
     } else {
       decls_block::AccessorLayout::readRecord(scratch, contextID, isImplicit,
@@ -3198,7 +3196,6 @@ class DeclDeserializer {
     fn->setForcedStaticDispatch(hasForcedStaticDispatch);
     ctx.evaluator.cacheOutput(NeedsNewVTableEntryRequest{fn},
                               std::move(needsNewVTableEntry));
-    fn->setUserAccessible(isUserAccessible);
 
     if (opaqueReturnTypeID) {
       ctx.evaluator.cacheOutput(

lib/Serialization/ModuleFormat.h

@@ -55,7 +55,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 571; // @objc protocols get AnyObject constraint
+const uint16_t SWIFTMODULE_VERSION_MINOR = 572; // revert isUserAccessible
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -1307,7 +1307,6 @@ namespace decls_block {
     AccessLevelField, // access level
     BCFixed<1>,   // requires a new vtable slot
     DeclIDField,  // opaque result type decl
-    BCFixed<1>,   // isUserAccessible?
     BCArray<IdentifierIDField> // name components,
                                // followed by TypeID dependencies
     // The record is trailed by:

lib/Serialization/Serialization.cpp

@@ -3437,7 +3437,6 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
                            rawAccessLevel,
                            fn->needsNewVTableEntry(),
                            S.addDeclRef(fn->getOpaqueResultTypeDecl()),
-                           fn->isUserAccessible(),
                            nameComponentsAndDependencies);
 
     writeGenericParams(fn->getGenericParams());