Merge remote-tracking branch 'origin/master' into master-rebranch

swift-ci · swift-ci · commit e1838a334b5a · 2019-08-19T15:44:00.000-07:00
diff --git a/include/swift/IDE/DigesterEnums.def b/include/swift/IDE/DigesterEnums.def
@@ -152,9 +152,11 @@ KEY_STRING(IntrowatchOS, intro_watchOS)
 KEY_STRING(Introswift, intro_swift)
 
 KEY_STRING_ARR(SuperclassNames, superclassNames)
+KEY_STRING_ARR(ToolArgs, tool_arguments)
 
 KEY_UINT(SelfIndex, selfIndex)
 KEY_UINT(FixedBinaryOrder, fixedbinaryorder)
+KEY_UINT(JsonFormatVer, json_format_version)
 
 KEY(children)
 KEY(conformances)
diff --git a/test/api-digester/Outputs/cake-abi.json b/test/api-digester/Outputs/cake-abi.json
@@ -1753,5 +1753,6 @@
         }
       ]
     }
-  ]
+  ],
+  "json_format_version": 1
 }
diff --git a/test/api-digester/Outputs/cake.json b/test/api-digester/Outputs/cake.json
@@ -1621,5 +1621,6 @@
         }
       ]
     }
-  ]
+  ],
+  "json_format_version": 1
 }
diff --git a/test/api-digester/Outputs/clang-module-dump.txt b/test/api-digester/Outputs/clang-module-dump.txt
@@ -168,5 +168,6 @@
         "ObjC"
       ]
     }
-  ]
+  ],
+  "json_format_version": 1
 }
diff --git a/test/api-digester/clang-module-dump.swift b/test/api-digester/clang-module-dump.swift
@@ -2,5 +2,5 @@
 // RUN: %empty-directory(%t.mod)
 // RUN: %empty-directory(%t.sdk)
 // RUN: %empty-directory(%t.module-cache)
-// RUN: %api-digester -dump-sdk -module Foo -o %t.result -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 4 -I %S/Inputs/Foo -avoid-location
+// RUN: %api-digester -dump-sdk -module Foo -o %t.result -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 4 -I %S/Inputs/Foo -avoid-location -avoid-tool-args
 // RUN: diff -u %S/Outputs/clang-module-dump.txt %t.result
diff --git a/test/api-digester/dump-module.swift b/test/api-digester/dump-module.swift
@@ -2,9 +2,9 @@
 // RUN: %empty-directory(%t.sdk)
 // RUN: %empty-directory(%t.module-cache)
 // RUN: %swift -emit-module -o %t.mod/cake.swiftmodule %S/Inputs/cake.swift -parse-as-library -I %S/Inputs/ClangCake %clang-importer-sdk-nosource
-// RUN: %api-digester -dump-sdk -module cake -o %t.dump.json -module-cache-path %t.module-cache -swift-only -I %t.mod -I %S/Inputs/ClangCake %clang-importer-sdk-nosource
+// RUN: %api-digester -dump-sdk -module cake -o %t.dump.json -module-cache-path %t.module-cache -swift-only -I %t.mod -I %S/Inputs/ClangCake %clang-importer-sdk-nosource -avoid-tool-args
 // RUN: diff -u %S/Outputs/cake.json %t.dump.json
-// RUN: %api-digester -dump-sdk -module cake -o %t.dump.json -module-cache-path %t.module-cache -swift-only -I %t.mod -abi -I %S/Inputs/ClangCake %clang-importer-sdk-nosource
+// RUN: %api-digester -dump-sdk -module cake -o %t.dump.json -module-cache-path %t.module-cache -swift-only -I %t.mod -abi -I %S/Inputs/ClangCake %clang-importer-sdk-nosource -avoid-tool-args
 // RUN: diff -u %S/Outputs/cake-abi.json %t.dump.json
 // RUN: %api-digester -diagnose-sdk --input-paths %t.dump.json -input-paths %S/Outputs/cake.json
 
diff --git a/tools/swift-api-digester/ModuleAnalyzerNodes.cpp b/tools/swift-api-digester/ModuleAnalyzerNodes.cpp
@@ -79,7 +79,9 @@ void SDKNodeRoot::registerDescendant(SDKNode *D) {
 SDKNode::SDKNode(SDKNodeInitInfo Info, SDKNodeKind Kind): Ctx(Info.Ctx),
   Name(Info.Name), PrintedName(Info.PrintedName), TheKind(unsigned(Kind)) {}
 
-SDKNodeRoot::SDKNodeRoot(SDKNodeInitInfo Info): SDKNode(Info, SDKNodeKind::Root) {}
+SDKNodeRoot::SDKNodeRoot(SDKNodeInitInfo Info): SDKNode(Info, SDKNodeKind::Root),
+  ToolArgs(Info.ToolArgs),
+  JsonFormatVer(Info.JsonFormatVer.hasValue() ? *Info.JsonFormatVer : DIGESTER_JSON_DEFAULT_VERSION) {}
 
 SDKNodeDecl::SDKNodeDecl(SDKNodeInitInfo Info, SDKNodeKind Kind)
       : SDKNode(Info, Kind), DKind(Info.DKind), Usr(Info.Usr),
@@ -367,6 +369,8 @@ SDKNode *SDKNodeRoot::getInstance(SDKContext &Ctx) {
   SDKNodeInitInfo Info(Ctx);
   Info.Name = Ctx.buffer("TopLevel");
   Info.PrintedName = Ctx.buffer("TopLevel");
+  Info.ToolArgs = Ctx.getOpts().ToolArgs;
+  Info.JsonFormatVer = DIGESTER_JSON_VERSION;
   return Info.createSDKNode(SDKNodeKind::Root);
 }
 
@@ -1834,6 +1838,13 @@ void SDKNode::jsonize(json::Output &out) {
   out.mapOptional(getKeyContent(Ctx, KeyKind::KK_children).data(), Children);
 }
 
+void SDKNodeRoot::jsonize(json::Output &out) {
+  SDKNode::jsonize(out);
+  out.mapRequired(getKeyContent(Ctx, KeyKind::KK_json_format_version).data(), JsonFormatVer);
+  if (!Ctx.getOpts().AvoidToolArgs)
+    out.mapOptional(getKeyContent(Ctx, KeyKind::KK_tool_arguments).data(), ToolArgs);
+}
+
 void SDKNodeConformance::jsonize(json::Output &out) {
   SDKNode::jsonize(out);
   output(out, KeyKind::KK_usr, Usr);
diff --git a/tools/swift-api-digester/ModuleAnalyzerNodes.h b/tools/swift-api-digester/ModuleAnalyzerNodes.h
@@ -58,6 +58,13 @@ class Output;
 namespace ide {
 namespace api {
 
+/// Serialized json format  version number.
+///
+/// When the json format changes in a way that requires version-specific handling, this number should be incremented.
+/// This ensures we could have backward compatibility so that version changes in the format won't stop the checker from working.
+const uint8_t DIGESTER_JSON_VERSION = 1; // Adding digester_version to the format
+const uint8_t DIGESTER_JSON_DEFAULT_VERSION = 0; // Use this version number for files before we have a version number in json.
+
 class SDKNode;
 typedef SDKNode* NodePtr;
 typedef std::map<NodePtr, NodePtr> ParentMap;
@@ -140,13 +147,15 @@ struct BreakingAttributeInfo {
 
 struct CheckerOptions {
   bool AvoidLocation;
+  bool AvoidToolArgs;
   bool ABI;
   bool Verbose;
   bool AbortOnModuleLoadFailure;
   bool PrintModule;
   bool SwiftOnly;
   bool SkipOSCheck;
   StringRef LocationFilter;
+  std::vector<StringRef> ToolArgs;
 };
 
 class SDKContext {
@@ -383,12 +392,16 @@ class SDKNodeDecl: public SDKNode {
 class SDKNodeRoot: public SDKNode {
   /// This keeps track of all decl descendants with USRs.
   llvm::StringMap<llvm::SmallSetVector<SDKNodeDecl*, 2>> DescendantDeclTable;
-
+  /// The tool invocation arguments to generate this root node. We shouldn't need APIs for it.
+  std::vector<StringRef> ToolArgs;
+  uint8_t JsonFormatVer;
 public:
   SDKNodeRoot(SDKNodeInitInfo Info);
   static SDKNode *getInstance(SDKContext &Ctx);
   static bool classof(const SDKNode *N);
   void registerDescendant(SDKNode *D);
+  virtual void jsonize(json::Output &Out) override;
+  Optional<uint8_t> getJsonFormatVersion() const { return JsonFormatVer; }
   ArrayRef<SDKNodeDecl*> getDescendantsByUsr(StringRef Usr) {
     return DescendantDeclTable[Usr].getArrayRef();
   }
diff --git a/tools/swift-api-digester/swift-api-digester.cpp b/tools/swift-api-digester/swift-api-digester.cpp
@@ -206,6 +206,11 @@ AvoidLocation("avoid-location",
               llvm::cl::desc("Avoid serializing the file paths of SDK nodes."),
               llvm::cl::cat(Category));
 
+static llvm::cl::opt<bool>
+AvoidToolArgs("avoid-tool-args",
+              llvm::cl::desc("Avoid serializing the arguments for invoking the tool."),
+              llvm::cl::cat(Category));
+
 static llvm::cl::opt<std::string>
 LocationFilter("location",
               llvm::cl::desc("Filter nodes with the given location."),
@@ -2443,16 +2448,19 @@ static int deserializeNameCorrection(APIDiffItemStore &Store,
   return EC.value();
 }
 
-static CheckerOptions getCheckOpts() {
+static CheckerOptions getCheckOpts(int argc, char *argv[]) {
   CheckerOptions Opts;
   Opts.AvoidLocation = options::AvoidLocation;
+  Opts.AvoidToolArgs = options::AvoidToolArgs;
   Opts.ABI = options::Abi;
   Opts.Verbose = options::Verbose;
   Opts.AbortOnModuleLoadFailure = options::AbortOnModuleLoadFailure;
   Opts.LocationFilter = options::LocationFilter;
   Opts.PrintModule = options::PrintModule;
   Opts.SwiftOnly = options::SwiftOnly;
   Opts.SkipOSCheck = options::DisableOSChecks;
+  for (int i = 1; i < argc; ++i)
+    Opts.ToolArgs.push_back(StringRef(argv[i]));
   return Opts;
 }
 
@@ -2482,7 +2490,7 @@ int main(int argc, char *argv[]) {
   std::vector<std::string> PrintApis;
   llvm::StringSet<> IgnoredUsrs;
   readIgnoredUsrs(IgnoredUsrs);
-  CheckerOptions Opts = getCheckOpts();
+  CheckerOptions Opts = getCheckOpts(argc, argv);
   for (auto Name : options::ApisPrintUsrs)
     PrintApis.push_back(Name);
   switch (options::Action) {

Original file line number	Diff line number	Diff line change
`@@ -1753,5 +1753,6 @@`
`1753`	`1753`	`}`
`1754`	`1754`	`]`
`1755`	`1755`	`}`
`1756`		`- ]`
	`1756`	`+ ],`
	`1757`	`+ "json_format_version": 1`
`1757`	`1758`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1621,5 +1621,6 @@`
`1621`	`1621`	`}`
`1622`	`1622`	`]`
`1623`	`1623`	`}`
`1624`		`- ]`
	`1624`	`+ ],`
	`1625`	`+ "json_format_version": 1`
`1625`	`1626`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,5 +168,6 @@`
`168`	`168`	`"ObjC"`
`169`	`169`	`]`
`170`	`170`	`}`
`171`		`- ]`
	`171`	`+ ],`
	`172`	`+ "json_format_version": 1`
`172`	`173`	`}`