ABI/API checker: include SDK version number when generating diagnostic baselines

Author: nkcsgexi

tools/swift-api-digester/ModuleAnalyzerNodes.cpp

@@ -395,7 +395,8 @@ SDKNode *SDKNodeRoot::getInstance(SDKContext &Ctx) {
   SDKNodeInitInfo Info(Ctx);
   Info.Name = Ctx.buffer("TopLevel");
   Info.PrintedName = Ctx.buffer("TopLevel");
-  Info.ToolArgs = Ctx.getOpts().ToolArgs;
+  llvm::transform(Ctx.getOpts().ToolArgs, std::back_inserter(Info.ToolArgs),
+                  [&](std::string s) { return Ctx.buffer(s); });
   Info.JsonFormatVer = DIGESTER_JSON_VERSION;
   return Info.createSDKNode(SDKNodeKind::Root);
 }

tools/swift-api-digester/ModuleAnalyzerNodes.h

@@ -156,7 +156,7 @@ struct CheckerOptions {
   bool SkipOSCheck;
   bool Migrator;
   StringRef LocationFilter;
-  std::vector<StringRef> ToolArgs;
+  std::vector<std::string> ToolArgs;
 };
 
 class SDKContext {

tools/swift-api-digester/swift-api-digester.cpp

@@ -2522,7 +2522,15 @@ static CheckerOptions getCheckOpts(int argc, char *argv[]) {
   Opts.SwiftOnly = options::SwiftOnly;
   Opts.SkipOSCheck = options::DisableOSChecks;
   for (int i = 1; i < argc; ++i)
-    Opts.ToolArgs.push_back(StringRef(argv[i]));
+    Opts.ToolArgs.push_back(argv[i]);
+
+  if (!options::SDK.empty()) {
+    auto Ver = getSDKVersion(options::SDK);
+    if (!Ver.empty()) {
+      Opts.ToolArgs.push_back("-sdk-version");
+      Opts.ToolArgs.push_back(Ver);
+    }
+  }
   return Opts;
 }