diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2019-07-18 07:17:49 +0000 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2019-07-18 07:17:49 +0000 |
| commit | 36082e397dd3861a53f67a0762856acacc5f16df (patch) | |
| tree | 2c077f9f46c16dfc080a1305c4b444ac401d3b9f /clang/lib/Sema/SemaCodeComplete.cpp | |
| parent | 5dd86ab2dd6b3cf447f24a619b2e651a8d7f20fc (diff) | |
| download | bcm5719-llvm-36082e397dd3861a53f67a0762856acacc5f16df.tar.gz bcm5719-llvm-36082e397dd3861a53f67a0762856acacc5f16df.zip | |
[CodeComplete] Fix ASTUnit cached completion of macros from preamble, broken in r342528
Summary:
The problem is the default LoadExternal with no completer, which happens when
loading global results.
Reviewers: ilya-biryukov, nik
Subscribers: arphaman, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D64864
llvm-svn: 366409
Diffstat (limited to 'clang/lib/Sema/SemaCodeComplete.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index 93a104e3ade..e4bbee86e35 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -8603,8 +8603,7 @@ void Sema::CodeCompletePreprocessorExpression() { if (!CodeCompleter || CodeCompleter->includeMacros()) AddMacroResults(PP, Results, - CodeCompleter ? CodeCompleter->loadExternal() : false, - true); + !CodeCompleter || CodeCompleter->loadExternal(), true); // defined (<macro>) Results.EnterNewScope(); @@ -8801,8 +8800,7 @@ void Sema::GatherGlobalCodeCompletions( if (!CodeCompleter || CodeCompleter->includeMacros()) AddMacroResults(PP, Builder, - CodeCompleter ? CodeCompleter->loadExternal() : false, - true); + !CodeCompleter || CodeCompleter->loadExternal(), true); Results.clear(); Results.insert(Results.end(), Builder.data(), |
