diff options
author | Tom Stellard <thomas.stellard@amd.com> | 2015-05-04 19:18:18 +0000 |
---|---|---|
committer | Tom Stellard <thomas.stellard@amd.com> | 2015-05-04 19:18:18 +0000 |
commit | 034f3f6a572b645f40f020a330197b9a5489c87e (patch) | |
tree | fd9c981739005f70a6aa1d9cb49bd2dc81f2d314 | |
parent | e1d60147c8246e289429baac914e28afe5699333 (diff) | |
download | llvm-034f3f6a572b645f40f020a330197b9a5489c87e.zip llvm-034f3f6a572b645f40f020a330197b9a5489c87e.tar.gz llvm-034f3f6a572b645f40f020a330197b9a5489c87e.tar.bz2 |
GCOV: Fix ABI breakage from r236303
This effectively reverts the part of r236303, which added a new member
to the GCOVOptions and broke ABI compatibility with 3.6.0.
llvm-svn: 236445
-rw-r--r-- | llvm/include/llvm/Transforms/Instrumentation.h | 4 | ||||
-rw-r--r-- | llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/llvm/include/llvm/Transforms/Instrumentation.h b/llvm/include/llvm/Transforms/Instrumentation.h index 0de2d75..24e3ef7 100644 --- a/llvm/include/llvm/Transforms/Instrumentation.h +++ b/llvm/include/llvm/Transforms/Instrumentation.h @@ -59,10 +59,6 @@ struct GCOVOptions { // Emit the name of the function in the .gcda files. This is redundant, as // the function identifier can be used to find the name from the .gcno file. bool FunctionNamesInData; - - // Emit the exit block immediately after the start block, rather than after - // all of the function body's blocks. - bool ExitBlockBeforeBody; }; ModulePass *createGCOVProfilerPass(const GCOVOptions &Options = GCOVOptions::getDefault()); diff --git a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp index ec8e86b..60b541f 100644 --- a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp +++ b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp @@ -57,7 +57,6 @@ GCOVOptions GCOVOptions::getDefault() { Options.UseCfgChecksum = false; Options.NoRedZone = false; Options.FunctionNamesInData = true; - Options.ExitBlockBeforeBody = DefaultExitBlockBeforeBody; if (DefaultGCOVVersion.size() != 4) { llvm::report_fatal_error(std::string("Invalid -default-gcov-version: ") + @@ -519,7 +518,7 @@ void GCOVProfiler::emitProfileNotes() { Funcs.push_back(make_unique<GCOVFunction>(SP, &out, FunctionIdent++, Options.UseCfgChecksum, - Options.ExitBlockBeforeBody)); + DefaultExitBlockBeforeBody)); GCOVFunction &Func = *Funcs.back(); for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) { |