[apinotes] Upstream changes to `APINotesYAMLCompiler.cpp`.

[compnerd]

Can you please add a round trip test as well? Additionally, please add a proper commit message to describe the change here.

clang/lib/APINotes/APINotesYAMLCompiler.cpp

425

Any reason to shorten Functions to Funcs? It seems that it would be a bit odd given the other members.

[zoecarver]

Can you please add a round trip test as well?

There is no testing infrastructure for this upstream. I have tests downstream.

clang/lib/APINotes/APINotesYAMLCompiler.cpp

struct Function {
   NullabilitySeq Nullability;
   Optional<NullabilityKind> NullabilityOfRet;
   Optional<api_notes::RetainCountConventionKind> RetainCountConvention;
   AvailabilityItem Availability;
   Optional<bool> SwiftPrivate;
   StringRef SwiftName;
   StringRef Type;
   StringRef ResultType;
+  Optional<StringRef> ImportAs;
 };
 
 typedef std::vector<Function> FunctionsSeq;
 } // namespace
 
 LLVM_YAML_IS_SEQUENCE_VECTOR(Function)
 
 namespace llvm {
 namespace yaml {
 template <> struct MappingTraits<Function> {
   static void mapping(IO &IO, Function &F) {
     IO.mapRequired("Name", F.Name);
     IO.mapOptional("Parameters", F.Params);
     IO.mapOptional("Nullability", F.Nullability);
     IO.mapOptional("NullabilityOfRet", F.NullabilityOfRet, llvm::None);
     IO.mapOptional("RetainCountConvention", F.RetainCountConvention);
     IO.mapOptional("Availability", F.Availability.Mode,
                    APIAvailability::Available);
     IO.mapOptional("AvailabilityMsg", F.Availability.Msg, StringRef(""));
     IO.mapOptional("SwiftPrivate", F.SwiftPrivate);
     IO.mapOptional("SwiftName", F.SwiftName, StringRef(""));
     IO.mapOptional("ResultType", F.ResultType, StringRef(""));
+    IO.mapOptional("ImportAs", F.ImportAs);
   }
 };
 } // namespace yaml
 } // namespace llvm
 
 namespace {
 struct GlobalVariable {
   StringRef Name;
struct Tag {
   AvailabilityItem Availability;
   StringRef SwiftName;
   Optional<bool> SwiftPrivate;
   Optional<StringRef> SwiftBridge;
   Optional<StringRef> NSErrorDomain;
   Optional<EnumExtensibilityKind> EnumExtensibility;
   Optional<bool> FlagEnum;
   Optional<EnumConvenienceAliasKind> EnumConvenienceKind;
+  Optional<StringRef> ImportAs;
+  Optional<StringRef> RetainOp;
+  Optional<StringRef> ReleaseOp;
+  FunctionsSeq MemberFuncs;
 };
 
 typedef std::vector<Tag> TagsSeq;
 } // namespace
 
 LLVM_YAML_IS_SEQUENCE_VECTOR(Tag)
 
 namespace llvm {
static void mapping(IO &IO, Tag &T) {
     IO.mapOptional("AvailabilityMsg", T.Availability.Msg, StringRef(""));
     IO.mapOptional("SwiftPrivate", T.SwiftPrivate);
     IO.mapOptional("SwiftName", T.SwiftName, StringRef(""));
     IO.mapOptional("SwiftBridge", T.SwiftBridge);
     IO.mapOptional("NSErrorDomain", T.NSErrorDomain);
     IO.mapOptional("EnumExtensibility", T.EnumExtensibility);
     IO.mapOptional("FlagEnum", T.FlagEnum);
     IO.mapOptional("EnumKind", T.EnumConvenienceKind);
+    IO.mapOptional("ImportAs", T.ImportAs);
+    IO.mapOptional("Retain", T.RetainOp);
+    IO.mapOptional("Release", T.ReleaseOp);
+    IO.mapOptional("Methods", T.MemberFuncs);
   }
 };
 } // namespace yaml
 } // namespace llvm
 
 namespace {
 struct Typedef {
   StringRef Name;