1 files changed, 3 insertions, 85 deletions

diff --git a/llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp b/llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
index 8dacc92bc26..c518821a6dd 100644
--- a/llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
+++ b/llvm/lib/Transforms/Instrumentation/BlockProfiling.cpp
@@ -21,93 +21,11 @@
 
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
+#include "ProfilingUtils.h"
 using namespace llvm;
 
-static void insertInitializationCall(Function *MainFn, const char *FnName,
-                                     GlobalValue *Array) {
-  const Type *ArgVTy = PointerType::get(PointerType::get(Type::SByteTy));
-  const Type *UIntPtr = PointerType::get(Type::UIntTy);
-  Module &M = *MainFn->getParent();
-  Function *InitFn = M.getOrInsertFunction(FnName, Type::IntTy, Type::IntTy,
-                                           ArgVTy, UIntPtr, Type::UIntTy, 0);
-
-  // This could force argc and argv into programs that wouldn't otherwise have
-  // them, but instead we just pass null values in.
-  std::vector<Value*> Args(4);
-  Args[0] = Constant::getNullValue(Type::IntTy);
-  Args[1] = Constant::getNullValue(ArgVTy);
-
-  // Skip over any allocas in the entry block.
-  BasicBlock *Entry = MainFn->begin();
-  BasicBlock::iterator InsertPos = Entry->begin();
-  while (isa<AllocaInst>(InsertPos)) ++InsertPos;
-
-  ConstantPointerRef *ArrayCPR = ConstantPointerRef::get(Array);
-  std::vector<Constant*> GEPIndices(2, Constant::getNullValue(Type::LongTy));
-  Args[2] = ConstantExpr::getGetElementPtr(ArrayCPR, GEPIndices);
-  
-  unsigned NumElements =
-    cast<ArrayType>(Array->getType()->getElementType())->getNumElements();
-  Args[3] = ConstantUInt::get(Type::UIntTy, NumElements);
-  
-  Instruction *InitCall = new CallInst(InitFn, Args, "newargc", InsertPos);
-
-  // If argc or argv are not available in main, just pass null values in.
-  Function::aiterator AI;
-  switch (MainFn->asize()) {
-  default:
-  case 2:
-    AI = MainFn->abegin(); ++AI;
-    if (AI->getType() != ArgVTy) {
-      InitCall->setOperand(2, new CastInst(AI, ArgVTy, "argv.cast", InitCall));
-    } else {
-      InitCall->setOperand(2, AI);
-    }
-
-  case 1:
-    AI = MainFn->abegin();
-    // If the program looked at argc, have it look at the return value of the
-    // init call instead.
-    if (AI->getType() != Type::IntTy) {
-      if (!AI->use_empty())
-        AI->replaceAllUsesWith(new CastInst(InitCall, AI->getType(), "",
-                                            InsertPos));
-      InitCall->setOperand(1, new CastInst(AI, Type::IntTy, "argc.cast",
-                                           InitCall));
-    } else {
-      AI->replaceAllUsesWith(InitCall);
-      InitCall->setOperand(1, AI);
-    }
-    
-  case 0: break;
-  }
-}
-
-static void IncrementCounterInBlock(BasicBlock *BB, unsigned CounterNum,
-                                    ConstantPointerRef *CounterArray) {
-  // Insert the increment after any alloca or PHI instructions...
-  BasicBlock::iterator InsertPos = BB->begin();
-  while (isa<AllocaInst>(InsertPos) || isa<PHINode>(InsertPos))
-    ++InsertPos;
-
-  // Create the getelementptr constant expression
-  std::vector<Constant*> Indices(2);
-  Indices[0] = Constant::getNullValue(Type::LongTy);
-  Indices[1] = ConstantSInt::get(Type::LongTy, CounterNum);
-  Constant *ElementPtr = ConstantExpr::getGetElementPtr(CounterArray, Indices);
-
-  // Load, increment and store the value back.
-  Value *OldVal = new LoadInst(ElementPtr, "OldFuncCounter", InsertPos);
-  Value *NewVal = BinaryOperator::create(Instruction::Add, OldVal,
-                                         ConstantInt::get(Type::UIntTy, 1),
-                                         "NewFuncCounter", InsertPos);
-  new StoreInst(NewVal, ElementPtr, InsertPos);
-}
-
-
 namespace {
   class FunctionProfiler : public Pass {
     bool run(Module &M);
@@ -145,7 +63,7 @@ bool FunctionProfiler::run(Module &M) {
       IncrementCounterInBlock(I->begin(), i++, CounterCPR);
 
   // Add the initialization call to main.
-  insertInitializationCall(Main, "llvm_start_func_profiling", Counters);
+  InsertProfilingInitCall(Main, "llvm_start_func_profiling", Counters);
   return true;
 }
 
@@ -186,7 +104,7 @@ bool BlockProfiler::run(Module &M) {
       IncrementCounterInBlock(BB, i++, CounterCPR);
 
   // Add the initialization call to main.
-  insertInitializationCall(Main, "llvm_start_block_profiling", Counters);
+  InsertProfilingInitCall(Main, "llvm_start_block_profiling", Counters);
   return true;
 }