ABI/API checker: abort after error occurs while importing a module

Author: nkcsgexi

tools/swift-api-digester/ModuleAnalyzerNodes.cpp

@@ -2097,7 +2097,7 @@ swift::ide::api::getSDKNodeRoot(SDKContext &SDKCtx,
     if (Opts.Verbose)
       llvm::errs() << "Loading module: " << Name << "...\n";
     auto *M = Ctx.getModuleByName(Name);
-    if (!M || M->failedToLoad()) {
+    if (!M || M->failedToLoad() || Ctx.Diags.hadAnyError()) {
       llvm::errs() << "Failed to load module: " << Name << '\n';
       if (Opts.AbortOnModuleLoadFailure)
         return nullptr;

utils/api_checker/swift-api-checker.py

@@ -33,8 +33,13 @@ def escapeCmdArg(arg):
 def check_call(cmd, cwd=None, env=os.environ, verbose=False, output=None):
     if verbose:
         print(' '.join([escapeCmdArg(arg) for arg in cmd]))
-    return subprocess.check_call(cmd, cwd=cwd, env=env,
-                                 stderr=None, stdout=output)
+    try:
+        subprocess.check_call(cmd, cwd=cwd, env=env,
+                              stderr=None, stdout=output)
+        return 0
+    except Exception as error:
+        printerr(error)
+        return 1
 
 
 def check_output(cmd, verbose=False):