nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap clang module files in a Mach-O, ELF, or COFF container.

Browse Source 
This is a necessary prerequisite for debugging with modules.
The .pcm files become containers that hold the serialized AST which allows
us to store debug information in the module file that can be shared by all
object files that were built importing the module.

rdar://problem/19104245

This reapplies r230044 with a fixed configure+make build and updated
dependencies. Take 3.

llvm-svn: 230305
This commit is contained in:
Adrian Prantl
2015-02-24 04:25:59 +00:00
parent c109102ecb
commit fc360dc30b
34 changed files with 403 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
clang/lib/Frontend/FrontendActions.cpp
View File

@@ -10,10 +10,13 @@
#include "clang/Frontend/FrontendActions.h"
#include "clang/AST/ASTConsumer.h"
#include "clang/Basic/FileManager.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/CodeGen/CodeGenModuleContainer.h"
#include "clang/Frontend/ASTConsumers.h"
#include "clang/Frontend/ASTUnit.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Frontend/FrontendDiagnostic.h"
#include "clang/Frontend/MultiplexConsumer.h"
#include "clang/Frontend/Utils.h"
#include "clang/Lex/HeaderSearch.h"
#include "clang/Lex/Pragma.h"
@@ -85,8 +88,23 @@ GeneratePCHAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) {
if (!CI.getFrontendOpts().RelocatablePCH)
Sysroot.clear();
return llvm::make_unique<PCHGenerator>(CI.getPreprocessor(), OutputFile,
nullptr, Sysroot, OS);
std::vector<std::unique_ptr<ASTConsumer>> Consumers;
Consumers.push_back(llvm::make_unique<PCHGenerator>(CI.getPreprocessor(),
OutputFile, nullptr,
Sysroot));
auto CGOpts = CI.getCodeGenOpts();
// The debug info emitted by ModuleContainerGenerator is not affected by the
// optimization level.
CGOpts.OptimizationLevel = 0;
CGOpts.setDebugInfo(CodeGenOptions::LimitedDebugInfo);
Consumers.push_back(std::unique_ptr<ASTConsumer>(
CreateModuleContainerGenerator(CI.getDiagnostics(), "PCH", CGOpts,
CI.getTargetOpts(), CI.getLangOpts(), OS,
cast<PCHGenerator>(Consumers[0].get()))));
return llvm::make_unique<MultiplexConsumer>(std::move(Consumers));
}
bool GeneratePCHAction::ComputeASTConsumerArguments(CompilerInstance &CI,
@@ -122,8 +140,22 @@ GenerateModuleAction::CreateASTConsumer(CompilerInstance &CI,
if (ComputeASTConsumerArguments(CI, InFile, Sysroot, OutputFile, OS))
return nullptr;
return llvm::make_unique<PCHGenerator>(CI.getPreprocessor(), OutputFile,
Module, Sysroot, OS);
std::vector<std::unique_ptr<ASTConsumer>> Consumers;
Consumers.push_back(llvm::make_unique<PCHGenerator>(CI.getPreprocessor(),
OutputFile, Module,
Sysroot));
auto CGOpts = CI.getCodeGenOpts();
// The debug info emitted by ModuleContainerGenerator is not affected by the
// optimization level.
CGOpts.OptimizationLevel = 0;
CGOpts.setDebugInfo(CodeGenOptions::LimitedDebugInfo);
Consumers.push_back(
std::unique_ptr<ASTConsumer>(CreateModuleContainerGenerator(
CI.getDiagnostics(), Module->getFullModuleName(), CGOpts,
CI.getTargetOpts(), CI.getLangOpts(), OS,
cast<PCHGenerator>(Consumers[0].get()))));
return llvm::make_unique<MultiplexConsumer>(std::move(Consumers));
}
static SmallVectorImpl<char> &