Make API digester -deserialize-sdk early exit on failure

beccadax · beccadax · commit 811721935962 · 2023-11-27T15:01:22.000-08:00
diff --git a/lib/APIDigester/ModuleAnalyzerNodes.cpp b/lib/APIDigester/ModuleAnalyzerNodes.cpp
@@ -2608,6 +2608,8 @@ int swift::ide::api::deserializeSDKDump(StringRef dumpPath, StringRef OutputPath
 
   SwiftDeclCollector Collector(Ctx);
   Collector.deSerialize(dumpPath);
+  if (Ctx.getDiags().hadAnyError())
+    return 1;
   Collector.serialize(FS);
   return 0;
 }
diff --git a/test/api-digester/diagnostics.swift b/test/api-digester/diagnostics.swift
@@ -1,4 +1,3 @@
-// REQUIRES: rdar46475075
 // REQUIRES: OS=macosx
 // RUN: not %api-digester -deserialize-sdk -input-paths %S/diagnostics.json -o - 2>&1 | %FileCheck %s
 

Original file line number	Diff line number	Diff line change
`@@ -2608,6 +2608,8 @@ int swift::ide::api::deserializeSDKDump(StringRef dumpPath, StringRef OutputPath`
`2608`	`2608`
`2609`	`2609`	`SwiftDeclCollector Collector(Ctx);`
`2610`	`2610`	`Collector.deSerialize(dumpPath);`
	`2611`	`+ if (Ctx.getDiags().hadAnyError())`
	`2612`	`+ return 1;`
`2611`	`2613`	`Collector.serialize(FS);`
`2612`	`2614`	`return 0;`
`2613`	`2615`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// REQUIRES: rdar46475075`
`2`	`1`	`// REQUIRES: OS=macosx`
`3`	`2`	`// RUN: not %api-digester -deserialize-sdk -input-paths %S/diagnostics.json -o - 2>&1 \| %FileCheck %s`
`4`	`3`