Index: llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h
===================================================================
--- llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h
+++ llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h
@@ -60,9 +60,10 @@
 public:
   /// Extensions are passed the builder itself (so they can see how it is
   /// configured) as well as the pass manager to add stuff to.
-  typedef std::function<void(const PassManagerBuilder &Builder,
-                             legacy::PassManagerBase &PM)>
-      ExtensionFn;
+  typedef void ExtensionProc(const PassManagerBuilder &Builder,
+                             legacy::PassManagerBase &PM);
+  typedef std::function<ExtensionProc> ExtensionFn;
+
   enum ExtensionPointTy {
     /// EP_EarlyAsPossible - This extension point allows adding passes before
     /// any other transformations, allowing them to see the code as it is coming
@@ -179,7 +180,7 @@
   /// Adds an extension that will be used by all PassManagerBuilder instances.
   /// This is intended to be used by plugins, to register a set of
   /// optimisations to run automatically.
-  static void addGlobalExtension(ExtensionPointTy Ty, ExtensionFn Fn);
+  static void addGlobalExtension(ExtensionPointTy Ty, ExtensionProc Fn);
   void addExtension(ExtensionPointTy Ty, ExtensionFn Fn);
 
 private:
@@ -208,10 +209,12 @@
 /// used by optimizer plugins to allow all front ends to transparently use
 /// them.  Create a static instance of this class in your plugin, providing a
 /// private function that the PassManagerBuilder can use to add your passes.
+/// Currently limited to real functions to avoid crashes when used within the
+/// main executable before a loaded plugin has a chance to use this.
 struct RegisterStandardPasses {
   RegisterStandardPasses(PassManagerBuilder::ExtensionPointTy Ty,
-                         PassManagerBuilder::ExtensionFn Fn) {
-    PassManagerBuilder::addGlobalExtension(Ty, std::move(Fn));
+                         PassManagerBuilder::ExtensionProc Fn) {
+    PassManagerBuilder::addGlobalExtension(Ty, Fn);
   }
 };
 
Index: llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp
===================================================================
--- llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp
+++ llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp
@@ -198,10 +198,9 @@
 static ManagedStatic<SmallVector<std::pair<PassManagerBuilder::ExtensionPointTy,
    PassManagerBuilder::ExtensionFn>, 8> > GlobalExtensions;
 
-void PassManagerBuilder::addGlobalExtension(
-    PassManagerBuilder::ExtensionPointTy Ty,
-    PassManagerBuilder::ExtensionFn Fn) {
-  GlobalExtensions->push_back(std::make_pair(Ty, std::move(Fn)));
+void PassManagerBuilder::addGlobalExtension(ExtensionPointTy Ty,
+                                            ExtensionProc Fn) {
+  GlobalExtensions->push_back(std::make_pair(Ty, Fn));
 }
 
 void PassManagerBuilder::addExtension(ExtensionPointTy Ty, ExtensionFn Fn) {
Index: llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt
===================================================================
--- llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt
+++ llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS Support)
+set(LLVM_LINK_COMPONENTS Support IPO)
 
 add_library(DynamicLibraryLib STATIC ExportedFuncs.cxx)
 
Index: llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
===================================================================
--- llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+++ llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
@@ -12,6 +12,7 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "gtest/gtest.h"
 
 #include "PipSqueak.h"
@@ -52,6 +53,28 @@
   return Tmp.P;
 }
 
+static void
+NoPassRegistration(const PassManagerBuilder &, legacy::PassManagerBase &) {
+}
+
+static RegisterStandardPasses LocalPass(PassManagerBuilder::EP_LoopOptimizerEnd,
+                                        NoPassRegistration);
+
+typedef void (*TestPassReg)(void (*)(PassManagerBuilder::ExtensionPointTy,
+                                     PassManagerBuilder::ExtensionProc));
+
+TEST(DynamicLibrary, PassRegistration) {
+  std::string Err;
+  llvm_shutdown_obj Shutdown;
+  DynamicLibrary DL =
+      DynamicLibrary::getPermanentLibrary(LibPath().c_str(), &Err);
+  EXPECT_TRUE(DL.isValid());
+  EXPECT_TRUE(Err.empty());
+
+  TestPassReg RP = FuncPtr<TestPassReg>(DL.getAddressOfSymbol("TestPassReg"));
+  RP(&PassManagerBuilder::addGlobalExtension);
+}
+
 static const char *OverloadTestA() { return "OverloadCall"; }
 
 std::string StdString(const char *Ptr) { return Ptr ? Ptr : ""; }
Index: llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx
===================================================================
--- llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx
+++ llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx
@@ -8,6 +8,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "PipSqueak.h"
+#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+
+#define PIPSQUEAK_TESTA_RETURN "LibCall"
+#include "ExportedFuncs.cxx"
 
 struct Global {
   std::string *Str;
@@ -45,5 +49,13 @@
   Glb.Vec = &V;
 }
 
-#define PIPSQUEAK_TESTA_RETURN "LibCall"
-#include "ExportedFuncs.cxx"
+
+static void LibPassRegistration(const llvm::PassManagerBuilder &,
+                                llvm::legacy::PassManagerBase &) {}
+
+extern "C" PIPSQUEAK_EXPORT void TestPassReg(
+    void (*addGlobalExtension)(llvm::PassManagerBuilder::ExtensionPointTy,
+                               llvm::PassManagerBuilder::ExtensionProc)) {
+  addGlobalExtension(llvm::PassManagerBuilder::EP_EarlyAsPossible,
+                     LibPassRegistration);
+}