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

Author: swift-ci

tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp

@@ -49,12 +49,16 @@ validateModule(llvm::StringRef data, bool Verbose,
                swift::serialization::ValidationInfo &info,
                swift::serialization::ExtendedValidationInfo &extendedInfo) {
   info = swift::serialization::validateSerializedAST(data, &extendedInfo);
-  if (info.status != swift::serialization::Status::Valid)
+  if (info.status != swift::serialization::Status::Valid) {
+    llvm::outs() << "error: validateSerializedAST() failed\n";
     return false;
+  }
 
   swift::CompilerInvocation CI;
-  if (CI.loadFromSerializedAST(data) != swift::serialization::Status::Valid)
+  if (CI.loadFromSerializedAST(data) != swift::serialization::Status::Valid) {
+    llvm::outs() << "error: loadFromSerializedAST() failed\n";
     return false;
+  }
 
   if (Verbose) {
     if (!info.shortVersion.empty())
@@ -265,6 +269,8 @@ int main(int argc, char **argv) {
   swift::serialization::ValidationInfo info;
   swift::serialization::ExtendedValidationInfo extendedInfo;
   for (auto &Module : Modules) {
+    info = {};
+    extendedInfo = {};
     if (!validateModule(StringRef(Module.first, Module.second), Verbose, info,
                         extendedInfo)) {
       llvm::errs() << "Malformed module!\n";
@@ -282,7 +288,8 @@ int main(int argc, char **argv) {
           reinterpret_cast<void *>(&anchorForGetMainExecutable)));
 
   // Infer SDK and Target triple from the module.
-  Invocation.setSDKPath(extendedInfo.getSDKPath());
+  if (!extendedInfo.getSDKPath().empty())
+    Invocation.setSDKPath(extendedInfo.getSDKPath());
   Invocation.setTargetTriple(info.targetTriple);
 
   Invocation.setModuleName("lldbtest");
@@ -294,13 +301,17 @@ int main(int argc, char **argv) {
     Invocation.setRuntimeResourcePath(ResourceDir);
   }
 
-  if (CI.setup(Invocation))
+  if (CI.setup(Invocation)) {
+    llvm::errs() << "error: Failed setup invocation!\n";
     return 1;
+  }
 
   for (auto &Module : Modules)
     if (!parseASTSection(*CI.getMemoryBufferSerializedModuleLoader(),
-                         StringRef(Module.first, Module.second), modules))
+                         StringRef(Module.first, Module.second), modules)) {
+      llvm::errs() << "error: Failed to parse AST section!\n";
       return 1;
+    }
 
   // Attempt to import all modules we found.
   for (auto path : modules) {