replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Preserve the full name of the file, so that '-c -o foo.pic.o' produces 

foo.pic.gcno instead of foo.gcno.

llvm-svn: 130899
This commit is contained in:
Nick Lewycky 2011-05-05 00:08:20 +00:00
parent e262299b72
commit 85c011ddc4
6 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/Driver/CC1Options.td
View File

@ -140,9 +140,9 @@ def femit_coverage_notes : Flag<"-femit-coverage-notes">,
HelpText<"Emit a gcov coverage notes file when compiling.">;
def femit_coverage_data: Flag<"-femit-coverage-data">,
HelpText<"Instrument the program to emit gcov coverage data when run.">;
def coverage_dir : Separate<"-coverage-dir">,
HelpText<"Emit coverage data to this directory.">;
def coverage_dir_EQ : Joined<"-coverage-dir=">, Alias<coverage_dir>;
def coverage_file : Separate<"-coverage-file">,
HelpText<"Emit coverage data to this filename. The extension will be replaced.">;
def coverage_file_EQ : Joined<"-coverage-file=">, Alias<coverage_file>;
def relaxed_aliasing : Flag<"-relaxed-aliasing">,
HelpText<"Turn off Type Based Alias Analysis">;
def masm_verbose : Flag<"-masm-verbose">,

5
clang/include/clang/Frontend/CodeGenOptions.h
View File

@ -95,8 +95,9 @@ public:
/// The code model to use (-mcmodel).
std::string CodeModel;
/// The directory in which to place coverage data files.
std::string CoverageDir;
/// The filename with path we use for coverage files. The extension will be
/// replaced.
std::string CoverageFile;
/// Enable additional debugging information.
std::string DebugPass;

12
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -134,7 +134,7 @@ void CodeGenModule::Release() {
EmitDeclMetadata();
if (getCodeGenOpts().EmitGcovArcs || getCodeGenOpts().EmitGcovNotes)
EmitCoverageDir();
EmitCoverageFile();
}
void CodeGenModule::UpdateCompletedType(const TagDecl *TD) {
@ -2219,16 +2219,16 @@ void CodeGenFunction::EmitDeclMetadata() {
}
}
void CodeGenModule::EmitCoverageDir() {
if (!getCodeGenOpts().CoverageDir.empty()) {
void CodeGenModule::EmitCoverageFile() {
if (!getCodeGenOpts().CoverageFile.empty()) {
if (llvm::NamedMDNode *CUNode = TheModule.getNamedMetadata("llvm.dbg.cu")) {
llvm::NamedMDNode *GCov = TheModule.getOrInsertNamedMetadata("llvm.gcov");
llvm::LLVMContext &Ctx = TheModule.getContext();
llvm::MDString *CoverageDir =
llvm::MDString::get(Ctx, getCodeGenOpts().CoverageDir);
llvm::MDString *CoverageFile =
llvm::MDString::get(Ctx, getCodeGenOpts().CoverageFile);
for (int i = 0, e = CUNode->getNumOperands(); i != e; ++i) {
llvm::MDNode *CU = CUNode->getOperand(i);
llvm::Value *node[] = { CoverageDir, CU };
llvm::Value *node[] = { CoverageFile, CU };
llvm::MDNode *N = llvm::MDNode::get(Ctx, node);
GCov->addOperand(N);
}

4
clang/lib/CodeGen/CodeGenModule.h
View File

@ -735,9 +735,9 @@ private:
void EmitDeclMetadata();
/// EmitCoverageDir - Emit the llvm.gcov metadata used to tell LLVM where
/// EmitCoverageFile - Emit the llvm.gcov metadata used to tell LLVM where
/// to emit the .gcno and .gcda files in a way that persists in .bc files.
void EmitCoverageDir();
void EmitCoverageFile();
/// MayDeferGeneration - Determine if the given decl can be emitted
/// lazily; this is only relevant for definitions. The given decl

8
clang/lib/Driver/Tools.cpp
View File

@ -1306,12 +1306,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
if (C.getArgs().hasArg(options::OPT_c) ||
C.getArgs().hasArg(options::OPT_S)) {
if (Output.isFilename()) {
llvm::StringRef CoverageDir =
llvm::sys::path::parent_path(Output.getFilename());
if (!CoverageDir.empty()) {
CmdArgs.push_back("-coverage-dir");
CmdArgs.push_back(Args.MakeArgString(CoverageDir));
}
CmdArgs.push_back("-coverage-file");
CmdArgs.push_back(Args.MakeArgString(Output.getFilename()));
}
}

2
clang/lib/Frontend/CompilerInvocation.cpp
View File

@ -974,7 +974,7 @@ static void ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
Opts.InstrumentForProfiling = Args.hasArg(OPT_pg);
Opts.EmitGcovArcs = Args.hasArg(OPT_femit_coverage_data);
Opts.EmitGcovNotes = Args.hasArg(OPT_femit_coverage_notes);
Opts.CoverageDir = Args.getLastArgValue(OPT_coverage_dir);
Opts.CoverageFile = Args.getLastArgValue(OPT_coverage_file);
if (Arg *A = Args.getLastArg(OPT_fobjc_dispatch_method_EQ)) {
llvm::StringRef Name = A->getValue(Args);