Adapt clang rC358696: removal of OutputIsBinary

This commit is contained in:
Fangrui Song 2019-04-18 19:16:24 -07:00
parent b1bcd0e0a2
commit ea8baa68db
2 changed files with 13 additions and 3 deletions

View File

@ -394,7 +394,12 @@ public:
std::vector<CompletionItem> ls_items;
CompletionConsumer(const CodeCompleteOptions &Opts, bool from_cache)
: CodeCompleteConsumer(Opts, false),
:
#if LLVM_VERSION_MAJOR >= 9 // rC358696
CodeCompleteConsumer(Opts),
#else
CodeCompleteConsumer(Opts, false),
#endif
Alloc(std::make_shared<clang::GlobalCodeCompletionAllocator>()),
CCTUInfo(Alloc), from_cache(from_cache) {}

View File

@ -63,9 +63,14 @@ class SignatureHelpConsumer : public CodeCompleteConsumer {
public:
bool from_cache;
SignatureHelp ls_sighelp;
SignatureHelpConsumer(const clang::CodeCompleteOptions &CCOpts,
SignatureHelpConsumer(const clang::CodeCompleteOptions &Opts,
bool from_cache)
: CodeCompleteConsumer(CCOpts, false),
:
#if LLVM_VERSION_MAJOR >= 9 // rC358696
CodeCompleteConsumer(Opts),
#else
CodeCompleteConsumer(Opts, false),
#endif
Alloc(std::make_shared<GlobalCodeCompletionAllocator>()),
CCTUInfo(Alloc), from_cache(from_cache) {}
void ProcessOverloadCandidates(Sema &S, unsigned CurrentArg,