swift-module-digester: non-final methods in fixed-layout classes no longer have fixed orders. rdar://46617463

Author: nkcsgexi

test/api-digester/Outputs/Cake-abi.txt

@@ -57,14 +57,11 @@ cake1: Var GlobalVarChangedToLet changes from var to let
 /* Fixed-layout Type changes */
 cake1: EnumElement FrozenKind.Fixed in a non-resilient type changes position from 1 to 2
 cake1: EnumElement FrozenKind.Rigid in a non-resilient type changes position from 2 to 1
-cake1: Func _NoResilientClass.FuncPositionChange0() in a non-resilient type changes position from 0 to 2
-cake1: Func _NoResilientClass.NoLongerFinalFunc() is now a non-final instance function
 cake1: Var fixedLayoutStruct.a in a non-resilient type changes position from 1 to 0
 cake1: Var fixedLayoutStruct.b in a non-resilient type changes position from 0 to 1
 cake1: Var fixedLayoutStruct2.BecomeFixedBinaryOrder is now a stored property
 cake1: Var fixedLayoutStruct2.NoLongerWithFixedBinaryOrder is no longer a stored property
 cake2: EnumElement FrozenKind.AddedCase is added to a non-resilient type
-cake2: Func _NoResilientClass.FuncPositionChange2() is added to a non-resilient type
 cake2: Var fixedLayoutStruct.c is added to a non-resilient type
 cake2: Var fixedLayoutStruct.lazy_d.storage is added to a non-resilient type
 

test/api-digester/Outputs/cake-abi.json

@@ -212,7 +212,6 @@
           "usr": "s:4cake2C1C4foo1yyFZ",
           "moduleName": "cake",
           "static": true,
-          "fixedbinaryorder": 0,
           "funcSelfKind": "NonMutating"
         },
         {

tools/swift-api-digester/ModuleAnalyzerNodes.cpp

@@ -1073,30 +1073,17 @@ Optional<uint8_t> SDKContext::getFixedBinaryOrder(ValueDecl *VD) const {
     }
     return false;
   };
-  // The relative order of non-final instance functions matters for non-resilient
-  // class.
-  auto isNonfinalFunc = [](Decl *M) {
-    if (auto *FD = dyn_cast<FuncDecl>(M)) {
-      return !isa<AccessorDecl>(FD) && !FD->isFinal();
-    }
-    return false;
-  };
+
   switch (NTD->getKind()) {
   case DeclKind::Enum: {
     return getSimilarMemberCount(NTD, VD, [](Decl *M) {
       return isa<EnumElementDecl>(M);
     });
   }
+  case DeclKind::Class:
   case DeclKind::Struct: {
     return getSimilarMemberCount(NTD, VD, isStored);
   }
-  case DeclKind::Class: {
-    if (auto count = getSimilarMemberCount(NTD, VD, isStored)) {
-      return count;
-    } else {
-      return getSimilarMemberCount(NTD, VD, isNonfinalFunc);
-    }
-  }
   default:
     llvm_unreachable("bad nominal type kind.");
   }