diff --git a/clang/lib/APINotes/APINotesYAMLCompiler.cpp b/clang/lib/APINotes/APINotesYAMLCompiler.cpp
--- a/clang/lib/APINotes/APINotesYAMLCompiler.cpp
+++ b/clang/lib/APINotes/APINotesYAMLCompiler.cpp
@@ -289,6 +289,7 @@
   StringRef SwiftName;
   StringRef Type;
   StringRef ResultType;
+  Optional<StringRef> ImportAs;
 };
 
 typedef std::vector<Function> FunctionsSeq;
@@ -311,6 +312,7 @@
     IO.mapOptional("SwiftPrivate", F.SwiftPrivate);
     IO.mapOptional("SwiftName", F.SwiftName, StringRef(""));
     IO.mapOptional("ResultType", F.ResultType, StringRef(""));
+    IO.mapOptional("ImportAs", F.ImportAs);
   }
 };
 } // namespace yaml
@@ -417,6 +419,10 @@
   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;
@@ -447,6 +453,10 @@
     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