diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-05-16 15:06:55 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-05-17 07:08:58 +0000 |
| commit | cbe51a943adebe43cfd8f20a190670a1d6a0e908 (patch) | |
| tree | 4a9ddc355d6d194b791f648711d1c6af0e33c221 /tools | |
| parent | 0e790628055f8e1edbc4a1176e3cc064cf544a2b (diff) | |
[backported/clang-7][libclang] Allow skipping function bodies in preamble only
--------------------------------------------------------------------------
* https://reviews.llvm.org/D45815
* Speed ups parse/reparse significantly but on the other hand does not
issue any more diagnostics from template functions from headers.
--------------------------------------------------------------------------
As an addition to CXTranslationUnit_SkipFunctionBodies, provide the
new option CXTranslationUnit_LimitSkipFunctionBodiesToPreamble,
which constraints the skipping of functions bodies to the preamble
only. Function bodies in the main file are not affected if this
option is set.
Skipping function bodies only in the preamble is what clangd already
does and the introduced flag implements it for libclang clients.
Change-Id: I092a2d78d1e59a9e546d317ee2f18c98cdc7dcdb
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/c-index-test/c-index-test.c | 2 | ||||
| -rw-r--r-- | tools/libclang/CIndex.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c index e9902efffb..bcc42ad994 100644 --- a/tools/c-index-test/c-index-test.c +++ b/tools/c-index-test/c-index-test.c @@ -82,6 +82,8 @@ static unsigned getDefaultParsingOptions() { options |= CXTranslationUnit_CreatePreambleOnFirstParse; if (getenv("CINDEXTEST_KEEP_GOING")) options |= CXTranslationUnit_KeepGoing; + if (getenv("CINDEXTEST_LIMIT_SKIP_FUNCTION_BODIES_TO_PREAMBLE")) + options |= CXTranslationUnit_LimitSkipFunctionBodiesToPreamble; return options; } diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 8d288b5dd5..884206d9d1 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -3376,9 +3376,15 @@ clang_parseTranslationUnit_Impl(CXIndex CIdx, const char *source_filename, = options & CXTranslationUnit_CacheCompletionResults; bool IncludeBriefCommentsInCodeCompletion = options & CXTranslationUnit_IncludeBriefCommentsInCodeCompletion; - bool SkipFunctionBodies = options & CXTranslationUnit_SkipFunctionBodies; bool SingleFileParse = options & CXTranslationUnit_SingleFileParse; bool ForSerialization = options & CXTranslationUnit_ForSerialization; + SkipFunctionBodiesScope SkipFunctionBodies = SkipFunctionBodiesScope::None; + if (options & CXTranslationUnit_SkipFunctionBodies) { + SkipFunctionBodies = + (options & CXTranslationUnit_LimitSkipFunctionBodiesToPreamble) + ? SkipFunctionBodiesScope::Preamble + : SkipFunctionBodiesScope::PreambleAndMainFile; + } // Configure the diagnostics. IntrusiveRefCntPtr<DiagnosticsEngine> |