3 files changed, 39 insertions, 10 deletions
diff --git a/include/llvm/IR/PassManager.h b/include/llvm/IR/PassManager.h
index 4a64f20c49..2664657694 100644
--- a/include/llvm/IR/PassManager.h
+++ b/include/llvm/IR/PassManager.h
@@ -189,7 +189,7 @@ public:
     Passes.push_back(new FunctionPassModel<FunctionPassT>(llvm_move(Pass)));
   }
 
-  bool run(Module *M);
+  bool run(Function *F);
 
 private:
   // Pull in the concept type and model template specialized for functions.
@@ -204,6 +204,36 @@ private:
   std::vector<polymorphic_ptr<FunctionPassConcept> > Passes;
 };
 
+/// \brief Trivial adaptor that maps from a module to its functions.
+///
+/// Designed to allow composition of a FunctionPass(Manager) and a
+/// ModulePassManager.
+template <typename FunctionPassT>
+class ModuleToFunctionPassAdaptor {
+public:
+  explicit ModuleToFunctionPassAdaptor(FunctionPassT Pass)
+      : Pass(llvm_move(Pass)) {}
+
+  /// \brief Runs the function pass across every function in the module.
+  bool run(Module *M) {
+    bool Changed = false;
+    for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
+      Changed |= Pass.run(I);
+    return Changed;
+  }
+
+private:
+  FunctionPassT Pass;
+};
+
+/// \brief A function to deduce a function pass type and wrap it in the
+/// templated adaptor.
+template <typename FunctionPassT>
+ModuleToFunctionPassAdaptor<FunctionPassT>
+createModuleToFunctionPassAdaptor(FunctionPassT Pass) {
+  return ModuleToFunctionPassAdaptor<FunctionPassT>(llvm_move(Pass));
+}
+
 /// \brief A module analysis pass manager with lazy running and caching of
 /// results.
 class ModuleAnalysisManager {
diff --git a/lib/IR/PassManager.cpp b/lib/IR/PassManager.cpp
index b53a2b9671..35fc534151 100644
--- a/lib/IR/PassManager.cpp
+++ b/lib/IR/PassManager.cpp
@@ -53,15 +53,14 @@ void ModuleAnalysisManager::invalidateImpl(void *PassID, Module *M) {
   ModuleAnalysisResults.erase(PassID);
 }
 
-bool FunctionPassManager::run(Module *M) {
+bool FunctionPassManager::run(Function *F) {
   bool Changed = false;
-  for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
-    for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
-      if (Passes[Idx]->run(I)) {
-        Changed = true;
-        if (AM)
-          AM->invalidateAll(I);
-      }
+  for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
+    if (Passes[Idx]->run(F)) {
+      Changed = true;
+      if (AM)
+        AM->invalidateAll(F);
+    }
   return Changed;
 }
 
diff --git a/unittests/IR/PassManagerTest.cpp b/unittests/IR/PassManagerTest.cpp
index cf7b6e4748..1e02d6ba02 100644
--- a/unittests/IR/PassManagerTest.cpp
+++ b/unittests/IR/PassManagerTest.cpp
@@ -120,7 +120,7 @@ TEST_F(PassManagerTest, Basic) {
   int FunctionPassRunCount = 0;
   int AnalyzedInstrCount = 0;
   FPM.addPass(TestFunctionPass(AM, FunctionPassRunCount, AnalyzedInstrCount));
-  MPM.addPass(FPM);
+  MPM.addPass(createModuleToFunctionPassAdaptor(FPM));
 
   MPM.run(M.get());
   EXPECT_EQ(1, ModulePassRunCount);