Upgrade the Giri code to LLVM 3.4

The main changes are:
 - The header files
 - The useless code is deleted
 - Rename of TargetData to DataLayout
 - Add -ltinfo to LDFLAGS of Makefile

Makefile.common.in

@@ -26,3 +26,4 @@ include $(PROJ_SRC_ROOT)/Makefile.llvm.rules
 
 CFLAGS += -Wno-deprecated
 CXXFLAGS += -Wno-deprecated
+LDFLAGS += -ltinfo

include/Giri/Giri.h

@@ -22,8 +22,8 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/Pass.h"
-#include "llvm/Support/InstVisitor.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/InstVisitor.h"
+#include "llvm/IR/DataLayout.h"
 
 #include <deque>
 #include <set>
@@ -50,17 +50,17 @@ class TracingNoGiri : public BasicBlockPass,
   /// This method is called after all the basic blocks have been transformed.
   /// It inserts code to initialize the run-time of the tracing library.
   virtual bool doFinalization(Module &M);
-  virtual bool doFinalization(Function &F) { return false; }
 
   virtual bool doInitialization(Function &F) { return false; }
+  virtual bool doFinalization(Function &F) { return false; }
 
   /// This method starts execution of the dynamic slice tracing instrumentation
   /// pass. It will add code to a function that records the execution of basic
   /// blocks.
   virtual bool runOnBasicBlock(BasicBlock &BB);
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-    AU.addRequired<TargetData>();
+    AU.addRequired<DataLayout>();
     AU.addRequired<QueryBasicBlockNumbers>();
     AU.addPreserved<QueryBasicBlockNumbers>();
 
@@ -104,7 +104,7 @@ class TracingNoGiri : public BasicBlockPass,
 
 private:
   // Pointers to other passes
-  const TargetData *TD;
+  const DataLayout *TD;
   const QueryBasicBlockNumbers *bbNumPass;
   const QueryLoadStoreNumbers  *lsNumPass;
 

include/Giri/TraceFile.h

@@ -20,7 +20,7 @@
 
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Value.h"
+#include "llvm/IR/Value.h"
 
 #include <deque>
 #include <iterator>

include/Utility/BasicBlockNumbering.h

@@ -16,8 +16,8 @@
 #ifndef DG_BASICBLOCKNUMBERING_H
 #define DG_BASICBLOCKNUMBERING_H
 
-#include "llvm/Function.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Module.h"
 #include "llvm/Pass.h"
 
 #include <map>

include/Utility/CountSrcLines.h

@@ -19,8 +19,7 @@
 #include "Utility/LoadStoreNumbering.h"
 
 #include "llvm/Pass.h"
-#include "llvm/Support/InstVisitor.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/InstVisitor.h"
 
 #include <deque>
 #include <set>

include/Utility/LoadStoreNumbering.h

@@ -18,10 +18,10 @@
 
 #include "Utility/Utils.h"
 
-#include "llvm/Function.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Module.h"
 #include "llvm/Pass.h"
-#include "llvm/Support/InstVisitor.h"
+#include "llvm/InstVisitor.h"
 
 #include <unordered_map>
 

include/Utility/SourceLineMapping.h

@@ -15,13 +15,11 @@
 #ifndef DG_SOURCELINEMAPPING_H
 #define DG_SOURCELINEMAPPING_H
 
-#include "llvm/Instruction.h"
+#include "llvm/IR/Instruction.h"
 #include "llvm/Pass.h"
 
 using namespace llvm;
 
-class llvm::raw_ostream;
-
 namespace dg {
 
 /// \class This pass provides the functionality to find the source file and

include/Utility/Utils.h

@@ -14,13 +14,13 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Function.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Module.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "llvm/Type.h"
+#include "llvm/IR/Type.h"
 
 #include <string>
 #include <sstream>

lib/Giri/Giri.cpp

@@ -20,8 +20,8 @@
 #include "Utility/Utils.h"
 
 #include "llvm/ADT/Statistic.h"
-#include "llvm/Analysis/DebugInfo.h"
-#include "llvm/IntrinsicInst.h"
+#include "llvm/DebugInfo.h"
+#include "llvm/IR/IntrinsicInst.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/InstIterator.h"
@@ -75,24 +75,6 @@ char DynamicGiri::ID = 0;
 // Pass registration
 static RegisterPass<DynamicGiri> X("dgiri", "Dynamic Backwards Slice Analysis");
 
-/// This function determines whether the specified value is a source of
-/// information (something that has a label independent of its input SSA values.
-///
-/// \param V - The value to analyze.
-/// \return true if this value is a source; otherwise false, its label is the
-/// join of the labels of its input operands.
-static inline bool isASource(const Value *V) {
-  // Call instructions are sources *unless* they are inline assembly.
-  if (const CallInst *CI = dyn_cast<CallInst>(V))
-    return !isa<InlineAsm>(CI->getCalledValue());
-
-  return isa<LoadInst>(V) ||
-         isa<Argument>(V) ||
-         isa<AllocaInst>(V) ||
-         isa<Constant>(V) ||
-         isa<GlobalValue>(V);
-}
-
 bool DynamicGiri::findExecForcers(BasicBlock *BB,
                                   std::set<unsigned> &bbNums) {
   // Get the parent function containing this basic block.  We'll need it for
@@ -271,7 +253,7 @@ void DynamicGiri::printBackwardsSlice(const Instruction *Criterion,
   std::string errinfo;
   raw_fd_ostream SliceFile(SliceFilename.c_str(),
                            errinfo,
-                           llvm::raw_fd_ostream::F_Append);
+                           sys::fs::F_Append);
   if (!errinfo.empty()) {
     errs() << "Error opening the slice output file: " << SliceFilename
            << " : " << errinfo << "\n";

lib/Giri/TraceFile.cpp

@@ -16,8 +16,8 @@
 #include "Giri/TraceFile.h"
 
 #include "llvm/ADT/Statistic.h"
-#include "llvm/Instructions.h"
-#include "llvm/IntrinsicInst.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/IntrinsicInst.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"

lib/Giri/TracingNoGiri.cpp

@@ -22,9 +22,9 @@
 #include "Utility/VectorExtras.h"
 
 #include "llvm/ADT/Statistic.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Instructions.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 
@@ -230,7 +230,7 @@ void TracingNoGiri::instrumentUnlock(Instruction *I) {
 
 void TracingNoGiri::insertIntoGlobalCtorList(Function *RuntimeCtor) {
   // Insert the run-time ctor into the ctor list.
-  LLVMContext & Context = RuntimeCtor->getParent()->getContext();
+  LLVMContext &Context = RuntimeCtor->getParent()->getContext();
   Type *Int32Type = IntegerType::getInt32Ty(Context);
   std::vector<Constant *> CtorInits;
   CtorInits.push_back(ConstantInt::get(Int32Type, 65535));
@@ -240,7 +240,7 @@ void TracingNoGiri::insertIntoGlobalCtorList(Function *RuntimeCtor) {
   // Get the current set of static global constructors and add the new ctor
   // to the list.
   std::vector<Constant *> CurrentCtors;
-  Module & M = *(RuntimeCtor->getParent());
+  Module &M = *(RuntimeCtor->getParent());
   GlobalVariable *GVCtor = M.getNamedGlobal("llvm.global_ctors");
   if (GVCtor) {
     if (Constant *C = GVCtor->getInitializer()) {
@@ -265,15 +265,13 @@ void TracingNoGiri::insertIntoGlobalCtorList(Function *RuntimeCtor) {
   // Create a new initializer.
   ArrayType *AT = ArrayType::get(RuntimeCtorInit->getType(),
                                  CurrentCtors.size());
-  Constant *NewInit = ConstantArray::get(AT, CurrentCtors);
-
   // Create the new llvm.global_ctors global variable and replace all uses of
   // the old global variable with the new one.
   new GlobalVariable(M,
-                     NewInit->getType(),
+                     AT,
                      false,
                      GlobalValue::AppendingLinkage,
-                     NewInit,
+                     ConstantArray::get(AT, CurrentCtors),
                      "llvm.global_ctors");
 }
 
@@ -679,7 +677,7 @@ void TracingNoGiri::visitCallInst(CallInst &CI) {
 bool TracingNoGiri::runOnBasicBlock(BasicBlock &BB) {
   // Fetch the analysis results for numbering basic blocks.
   // Will be run once per module
-  TD        = &getAnalysis<TargetData>();
+  TD        = &getAnalysis<DataLayout>();
   bbNumPass = &getAnalysis<QueryBasicBlockNumbers>();
   lsNumPass = &getAnalysis<QueryLoadStoreNumbers>();
 

lib/Utility/BasicBlockNumbering.cpp

@@ -15,8 +15,8 @@
 
 #include "Utility/BasicBlockNumbering.h"
 
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Instructions.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"

lib/Utility/CountSrcLines.cpp

@@ -19,7 +19,7 @@
 #include "Utility/SourceLineMapping.h"
 
 #include "llvm/ADT/Statistic.h"
-#include "llvm/IntrinsicInst.h"
+#include "llvm/IR/IntrinsicInst.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"

lib/Utility/LoadStoreNumbering.cpp

@@ -17,8 +17,8 @@
 
 #include "Utility/LoadStoreNumbering.h"
 
-#include "llvm/Constants.h"
-#include "llvm/Instructions.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/Instructions.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"

lib/Utility/PostDominatorFrontier.cpp

@@ -15,7 +15,7 @@
 
 #include "Utility/PostDominanceFrontier.h"
 
-#include "llvm/Instructions.h"
+#include "llvm/IR/Instructions.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/DepthFirstIterator.h"

lib/Utility/SourceLineMapping.cpp

@@ -18,12 +18,12 @@
 #include "Utility/Utils.h"
 
 #include "llvm/ADT/Statistic.h"
-#include "llvm/Analysis/DebugInfo.h"
-#include "llvm/Instructions.h"
-#include "llvm/IntrinsicInst.h"
-#include "llvm/Function.h"
-#include "llvm/Module.h"
-#include "llvm/LLVMContext.h"
+#include "llvm/DebugInfo.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/IntrinsicInst.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/LLVMContext.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/CallSite.h"

runtime/Giri/Tracing.cpp

@@ -474,5 +474,5 @@ void recordSelect(unsigned id, unsigned char flag) {
   entryCache.addToEntryCache(Entry(RecordType::PDType,
                                    id,
                                    pthread_self(),
-                                   (unsigned char *)flag));
+                                   reinterpret_cast<unsigned char *>(flag)));
 }

tools/Makefile

@@ -8,6 +8,6 @@ LEVEL = ..
 #
 # List all of the subdirectories that we will compile.
 #
-DIRS = PrintTrace Tracer
+DIRS = PrintTrace
 
 include $(LEVEL)/Makefile.common

tools/Tracer/Tracer.cpp

@@ -20,8 +20,8 @@
 
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Module.h"
-#include "llvm/LLVMContext.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/LLVMContext.h"
 #include "llvm/PassManager.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CommandLine.h"
@@ -31,7 +31,7 @@
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/raw_os_ostream.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/IR/DataLayout.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
@@ -105,7 +105,7 @@ int main(int argc, char **argv) {
 
     // Build up all of the passes that we want to do to the module...
     PassManager Passes;
-    Passes.add(new TargetData(M.get()));
+    Passes.add(new DataLayout(M.get()));
 
     // Number all basic blocks and instructions.
     Passes.add(new BasicBlockNumberPass());