[llvm-branch-commits] [llvm-branch] r236445 - GCOV: Fix ABI breakage from r236303

[Tom Stellard]

Author: tstellar
Date: Mon May  4 14:18:18 2015
New Revision: 236445

URL: http://llvm.org/viewvc/llvm-project?rev=236445&view=rev
Log:
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.

Modified:
    llvm/branches/release_36/include/llvm/Transforms/Instrumentation.h
    llvm/branches/release_36/lib/Transforms/Instrumentation/GCOVProfiling.cpp

Modified: llvm/branches/release_36/include/llvm/Transforms/Instrumentation.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/include/llvm/Transforms/Instrumentation.h?rev=236445&r1=236444&r2=236445&view=diff
==============================================================================
--- llvm/branches/release_36/include/llvm/Transforms/Instrumentation.h (original)
+++ llvm/branches/release_36/include/llvm/Transforms/Instrumentation.h Mon May  4 14:18:18 2015
@@ -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());

Modified: llvm/branches/release_36/lib/Transforms/Instrumentation/GCOVProfiling.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/lib/Transforms/Instrumentation/GCOVProfiling.cpp?rev=236445&r1=236444&r2=236445&view=diff
==============================================================================
--- llvm/branches/release_36/lib/Transforms/Instrumentation/GCOVProfiling.cpp (original)
+++ llvm/branches/release_36/lib/Transforms/Instrumentation/GCOVProfiling.cpp Mon May  4 14:18:18 2015
@@ -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) {