Really fix <rdar://problem/7312058> by adding a 'displayDiagnostics' option to
clang_createTranslationUnit() and clang_createTranslationUnitFromSourceFile(). The user can now
specify if the diagnostics from Clang are printed to stderr or are silenced completely. We can
obviously evolve this API to be more general in the future.
Note: Added a FIXME since I wasn't certain what was the best way to redirect to something analogous
to '/dev/null' on Windows.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@84548 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp
index 3f3fc8c..77e7589 100644
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/CIndex/CIndex.cpp
@@ -350,15 +350,16 @@
// FIXME: need to pass back error info.
CXTranslationUnit clang_createTranslationUnit(
- CXIndex CIdx, const char *ast_filename)
+ CXIndex CIdx, const char *ast_filename, int displayDiagnostics)
{
assert(CIdx && "Passed null CXIndex");
CIndexer *CXXIdx = static_cast<CIndexer *>(CIdx);
std::string astName(ast_filename);
std::string ErrMsg;
+ DiagnosticClient *diagClient = displayDiagnostics
+ ? NULL : new IgnoreDiagnosticsClient();
- return ASTUnit::LoadFromPCHFile(astName, &ErrMsg,
- new IgnoreDiagnosticsClient(),
+ return ASTUnit::LoadFromPCHFile(astName, &ErrMsg, diagClient,
CXXIdx->getOnlyLocalDecls(),
/* UseBumpAllocator = */ true);
}
@@ -366,8 +367,8 @@
CXTranslationUnit clang_createTranslationUnitFromSourceFile(
CXIndex CIdx,
const char *source_filename,
- int num_command_line_args, const char **command_line_args)
-{
+ int num_command_line_args, const char **command_line_args,
+ int displayDiagnostics) {
// Build up the arguments for involing clang.
llvm::sys::Path ClangPath = static_cast<CIndexer *>(CIdx)->getClangPath();
std::vector<const char *> argv;
@@ -383,11 +384,21 @@
argv.push_back(NULL);
// Generate the AST file in a separate process.
+#ifdef LLVM_ON_WIN32
+ llvm::sys::Path DevNull("/dev/null")
+ llvm::sys::Path *Redirects[] = { &DevNull, &DevNull, &DevNull, NULL };
+ llvm::sys::Program::ExecuteAndWait(ClangPath, &argv[0],
+ !displayDiagnostics ? Redirects : NULL);
+#else
+ // FIXME: I don't know what is the equivalent '/dev/null' redirect for
+ // Windows for this API.
llvm::sys::Program::ExecuteAndWait(ClangPath, &argv[0]);
+#endif
// Finally, we create the translation unit from the ast file.
ASTUnit *ATU = static_cast<ASTUnit *>(
- clang_createTranslationUnit(CIdx, astTmpFile));
+ clang_createTranslationUnit(CIdx, astTmpFile,
+ displayDiagnostics));
ATU->unlinkTemporaryFile();
return ATU;
}