Fixed i8* to DFNode map\nFixed makefile to support different source and build trees

llvm/include/llvm/IR/DFGraph.h

@@ -148,13 +148,19 @@ private:
   Function* ArgMapFuncPointer;  ///< Function that associates the input
                                 ///< arguments of destination with the outputs
                                 ///< of source dataflow node
+  // Functions
+  DFEdge(DFNode* _SrcDF, DFNode* _DestDF, Function* _DFMapFuncPointer,
+         Function* _ArgMapFuncPointer) : SrcDF(_SrcDF), DestDF(_DestDF),
+         DFMapFuncPointer(_DFMapFuncPointer),
+         ArgMapFuncPointer(_ArgMapFuncPointer) {}
 
 public:
-  //FIXME: Write a matching constructor, then uncomment this function.
-  /*static DFEdge *Create(DFNode* SrcDF, DFNode* DestDF, Function* DFMapFuncPointer, Function* ArgMapFuncPointer) {
-    return new DFEdge(SrcDF, DestDF, DFMapFuncPointer, ArgMapFuncPointer);
 
-  }*/
+  static DFEdge *Create(DFNode* SrcDF, DFNode* DestDF, Function* DFMapFuncPtr,
+                        Function* ArgMapFuncPtr) {
+    return new DFEdge(SrcDF, DestDF, DFMapFuncPtr, ArgMapFuncPtr);
+
+  }
 };
 } // End llvm namespace
 

llvm/lib/Transforms/BuildDFG/BuildDFG.cpp

@@ -121,7 +121,7 @@ namespace {
     }
   }
 
-  void handleCreateEdge (DFNode* N, IntrinsicInst* II) {
+  void BuildDFG::handleCreateEdge (DFNode* N, IntrinsicInst* II) {
     // The DFNode structures must be in the map before the edge is processed
     HandleToDFNode::iterator DFI = HandleToDFNodeMap.find(II->getOperand(0));
     assert(DFI != HandleToDFNodeMap.end());

llvm/lib/Transforms/Makefile

@@ -8,7 +8,8 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-PARALLEL_DIRS = Utils Instrumentation Scalar InstCombine IPO Vectorize Hello ObjCARC
+PARALLEL_DIRS = Utils Instrumentation Scalar InstCombine IPO Vectorize Hello \
+                ObjCARC BuildDFG
 
 include $(LEVEL)/Makefile.config