Skip to content

[cxxmodules] Backport D39416 #1257

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

Merged
vgvassilev merged 1 commit into from
Nov 3, 2017
Merged

[cxxmodules] Backport D39416 #1257

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions interpreter/llvm/src/tools/clang/include/clang/Sema/MultiplexExternalSemaSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,10 @@ class MultiplexExternalSemaSource : public ExternalSemaSource {
/// \brief Print any statistics that have been gathered regarding
/// the external AST source.
void PrintStats() override;



/// \brief Retrieve the module that corresponds to the given module ID.
Module *getModule(unsigned ID) override;

/// \brief Perform layout on the given record.
///
/// This routine allows the external AST source to provide an specific
Expand Down
7 changes: 7 additions & 0 deletions interpreter/llvm/src/tools/clang/lib/Sema/MultiplexExternalSemaSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,13 @@ void MultiplexExternalSemaSource::PrintStats() {
Sources[i]->PrintStats();
}

Module *MultiplexExternalSemaSource::getModule(unsigned ID) {
for (size_t i = 0; i < Sources.size(); ++i)
if (auto M = Sources[i]->getModule(ID))
return M;
return nullptr;
}

bool MultiplexExternalSemaSource::layoutRecordType(const RecordDecl *Record,
uint64_t &Size,
uint64_t &Alignment,
Expand Down