3 files changed, 29 insertions, 26 deletions
diff --git a/include/llvm/Transforms/Instrumentation/ProfilePaths.h b/include/llvm/Transforms/Instrumentation/ProfilePaths.h
index de9d37c..4004c7f 100644
--- a/include/llvm/Transforms/Instrumentation/ProfilePaths.h
+++ b/include/llvm/Transforms/Instrumentation/ProfilePaths.h
@@ -27,17 +27,11 @@
 #ifndef LLVM_TRANSFORMS_INSTRUMENTATION_PROFILE_PATHS_H
 #define LLVM_TRANSFORMS_INSTRUMENTATION_PROFILE_PATHS_H
 
-#include "llvm/Pass.h"
+class Pass;
 
-class ProfilePaths: public MethodPass {
- public:
-  bool runOnMethod(Method *M);
-
-  // getAnalysisUsageInfo - transform cfg to have just one exit node
-  virtual void getAnalysisUsageInfo(Pass::AnalysisSet &Requires,
-                                    Pass::AnalysisSet &Destroyed,
-                                    Pass::AnalysisSet &Provided);
-};
+// createProfilePathsPass - Create a new pass to add path profiling
+//
+Pass *createProfilePathsPass();
 
 #endif
     
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp b/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp
index 03a3e4b..1be6458f 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp
@@ -32,10 +32,32 @@
 #include "llvm/ConstantVals.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/iMemory.h"
+#include "llvm/Pass.h"
 #include "Graph.h"
 
 using std::vector;
 
+class ProfilePaths: public MethodPass {
+ public:
+  bool runOnMethod(Method *M);
+
+  // Before this pass, make sure that there is only one 
+  // entry and only one exit node for the method in the CFG of the method
+  //
+  void ProfilePaths::getAnalysisUsageInfo(Pass::AnalysisSet &Requires,
+					  Pass::AnalysisSet &Destroyed,
+					  Pass::AnalysisSet &Provided) {
+    Requires.push_back(UnifyMethodExitNodes::ID);
+  }
+};
+
+// createProfilePathsPass - Create a new pass to add path profiling
+//
+Pass *createProfilePathsPass() {
+  return new ProfilePaths();
+}
+
+
 static Node *findBB(std::set<Node *> &st, BasicBlock *BB){
   for(std::set<Node *>::iterator si=st.begin(); si!=st.end(); ++si){
     if(((*si)->getElement())==BB){
@@ -145,18 +167,3 @@ bool ProfilePaths::runOnMethod(Method *M){
 
   return true;  // Always modifies method
 }
-
-//Before this pass, make sure that there is only one 
-//entry and only one exit node for the method in the CFG of the method
-void ProfilePaths::getAnalysisUsageInfo(Pass::AnalysisSet &Requires,
-					  Pass::AnalysisSet &Destroyed,
-					  Pass::AnalysisSet &Provided) {
-  Requires.push_back(UnifyMethodExitNodes::ID);
-}
-
-
-
-
-
-
-
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index 34eff8f..2b2447b 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -100,9 +100,11 @@ struct {
 
   { trace      , New<InsertTraceCode, bool, true, bool, true> },
   { tracem     , New<InsertTraceCode, bool, false, bool, true> },
-  { paths      , New<ProfilePaths> },
+  { paths      , createProfilePathsPass },
+
   { print      , NewPrintMethodPass },
   { verify     , createVerifierPass },
+
   { raiseallocs, New<RaiseAllocations> },
   { cleangcc   , New<CleanupGCCOutput> },
   { globaldce  , New<GlobalDCE> },