clang-import-test: Clean up error output for files that cannot be found

[dexonsmith]

Summary

Pass on the filesystem error string FileManager::getFileRef in
clang-import-test's ParseSource function. Also include "error:" and
a newline in the output. As a side effect, migrate to the FileEntryRef
overload of SourceManager::createFileID.

No real functionality change here, just slightly better output on error.

[dexonsmith]

If the error output changes seem imprudent, I'm happy to skip those; the only thing I need here is the migration to the other overload of createFileID (the "side effect"); could just call llvm::consumeError and be done with it.

[jansvoboda11]

LGTM.

[thakis]

This breaks tests on Windows: http://45.33.8.238/win/29686/step_7.txt

PTAL, and please revert for now if it takes a while to fix.

[dexonsmith]

In D92971#2449932, @thakis wrote:

This breaks tests on Windows: http://45.33.8.238/win/29686/step_7.txt

PTAL, and please revert for now if it takes a while to fix.

I'll fix now.

[dexonsmith]

In D92971#2449934, @dexonsmith wrote:

In D92971#2449932, @thakis wrote:

This breaks tests on Windows: http://45.33.8.238/win/29686/step_7.txt

PTAL, and please revert for now if it takes a while to fix.

I'll fix now.

e095959e0c23e250d6ad1dbe3612291736d12e1a makes it not platform-dependent.

[thakis]

Thanks for the quick fix! The bot is happy again.

clang/test/Import/missing-import/test.c

 // RUN: not clang-import-test -import %S/Inputs/S.c -expression %s 2>&1 | FileCheck %s
-// CHECK: {{.*}}Couldn't open{{.*}}Inputs/S.c{{.*}}
+// CHECK: error: No such file or directory: {{.*}}Inputs/S.c{{$}}
 void expr() {
   struct S MyS;
   void *MyPtr = &MyS;
 }

clang/tools/clang-import-test/clang-import-test.cpp

CIAndOrigins BuildIndirect(CIAndOrigins &CI) {
   IndirectCI.getCompilerInstance().setASTContext(AST.release());
   AddExternalSource(IndirectCI, CI);
   return IndirectCI;
 }
 
 llvm::Error ParseSource(const std::string &Path, CompilerInstance &CI,
                         ASTConsumer &Consumer) {
   SourceManager &SM = CI.getSourceManager();
-  auto FE = CI.getFileManager().getFile(Path);
+  auto FE = CI.getFileManager().getFileRef(Path);
   if (!FE) {
     return llvm::make_error<llvm::StringError>(
-        llvm::Twine("Couldn't open ", Path), std::error_code());
+        llvm::Twine(llvm::toString(FE.takeError())) + ": " + Path,
+        std::error_code());
   }
   SM.setMainFileID(SM.createFileID(*FE, SourceLocation(), SrcMgr::C_User));
   ParseAST(CI.getPreprocessor(), &Consumer, CI.getASTContext());
   return llvm::Error::success();
 }
 
 llvm::Expected<CIAndOrigins> Parse(const std::string &Path,
                                    llvm::MutableArrayRef<CIAndOrigins> Imports,

 int main(int argc, const char **argv) {
   const bool DisableCrashReporting = true;
   llvm::sys::PrintStackTraceOnErrorSignal(argv[0], DisableCrashReporting);
   llvm::cl::ParseCommandLineOptions(argc, argv);
   std::vector<CIAndOrigins> ImportCIs;
   for (auto I : Imports) {
     llvm::Expected<CIAndOrigins> ImportCI = Parse(I, {}, false, false);
     if (auto E = ImportCI.takeError()) {
-      llvm::errs() << llvm::toString(std::move(E));
+      llvm::errs() << "error: " << llvm::toString(std::move(E)) << "\n";
       exit(-1);
     }
     ImportCIs.push_back(std::move(*ImportCI));
   }
   std::vector<CIAndOrigins> IndirectCIs;
   if (!Direct || UseOrigins) {
     for (auto &ImportCI : ImportCIs) {
       CIAndOrigins IndirectCI = BuildIndirect(ImportCI);
       IndirectCIs.push_back(std::move(IndirectCI));
     }
   }
   if (UseOrigins)
     for (auto &ImportCI : ImportCIs)
       IndirectCIs.push_back(std::move(ImportCI));
   llvm::Expected<CIAndOrigins> ExpressionCI =
       Parse(Expression, (Direct && !UseOrigins) ? ImportCIs : IndirectCIs,
             DumpAST, DumpIR);
   if (auto E = ExpressionCI.takeError()) {
-    llvm::errs() << llvm::toString(std::move(E));
+    llvm::errs() << "error: " << llvm::toString(std::move(E)) << "\n";
     exit(-1);
   }
   Forget(*ExpressionCI, (Direct && !UseOrigins) ? ImportCIs : IndirectCIs);
   return 0;
 }