Skip to content

[cxxmodules] CIFactory now uses MultiplexConsumer #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Teemperor wants to merge 1 commit into from
Closed

[cxxmodules] CIFactory now uses MultiplexConsumer #988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[cxxmodules] CIFactory now uses MultiplexConsumer 
This is a preparation for C++ modules as they will require that
we attach multiple consumers to the CI.
  • Loading branch information
@Teemperor
Teemperor committed Sep 13, 2017
commit 90ed8a9c804687fbf351ea189cd1a7ae2d37ebf7
12 changes: 8 additions & 4 deletions interpreter/cling/lib/Interpreter/CIFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "clang/Driver/Job.h"
#include "clang/Driver/Tool.h"
#include "clang/Frontend/FrontendDiagnostic.h"
#include "clang/Frontend/MultiplexConsumer.h"
#include "clang/Frontend/TextDiagnosticPrinter.h"
#include "clang/Frontend/VerifyDiagnosticConsumer.h"
#include "clang/Serialization/SerializationDiagnostic.h"
Expand Down Expand Up @@ -966,18 +967,21 @@ static void stringifyPreprocSetting(PreprocessorOptions& PPOpts,
// Set up the ASTContext
CI->createASTContext();

std::vector<std::unique_ptr<ASTConsumer>> Consumers;

if (OnlyLex) {
assert(!customConsumer && "Can't specify a custom consumer when in "
"OnlyLex mode");
class IgnoreConsumer: public clang::ASTConsumer {};
CI->setASTConsumer(
std::unique_ptr<clang::ASTConsumer>(new IgnoreConsumer()));
} else {
assert(customConsumer && "Need to specify a custom consumer"
" when not in OnlyLex mode");
CI->setASTConsumer(std::move(customConsumer));
Consumers.push_back(std::move(customConsumer));
}

std::unique_ptr<clang::MultiplexConsumer> multiConsumer(
new clang::MultiplexConsumer(std::move(Consumers)));
CI->setASTConsumer(std::move(multiConsumer));

// Set up Sema
CodeCompleteConsumer* CCC = 0;
CI->createSema(TU_Complete, CCC);
Expand Down