[llvm] r305303 - Force RegisterStandardPasses to construct std::function in the IPO library.
Adrian Prantl via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 13 11:27:14 PDT 2017
It looks like this broke the stage 2 bots:
http://green.lab.llvm.org/green/job/clang-stage2-configure-Rlto_build/18448/consoleFull#-1569690971a1ca8a51-895e-46c6-af87-ce24fa4cd561 <http://green.lab.llvm.org/green/job/clang-stage2-configure-Rlto_build/18448/consoleFull#-1569690971a1ca8a51-895e-46c6-af87-ce24fa4cd561>
Could you please revert / investigate?
-- adrian
> On Jun 13, 2017, at 9:48 AM, Frederich Munch via llvm-commits <llvm-commits at lists.llvm.org> wrote:
>
> Author: marsupial
> Date: Tue Jun 13 11:48:41 2017
> New Revision: 305303
>
> URL: http://llvm.org/viewvc/llvm-project?rev=305303&view=rev
> Log:
> Force RegisterStandardPasses to construct std::function in the IPO library.
>
> Summary: Fixes an issue using RegisterStandardPasses from a statically linked object before PassManagerBuilder::addGlobalExtension is called from a dynamic library.
>
> Reviewers: efriedma, theraven
>
> Reviewed By: efriedma
>
> Subscribers: mehdi_amini, mgorny, llvm-commits
>
> Differential Revision: https://reviews.llvm.org/D33515
>
> Modified:
> llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h
> llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp
> llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt
> llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
> llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx
>
> Modified: llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h?rev=305303&r1=305302&r2=305303&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h (original)
> +++ llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h Tue Jun 13 11:48:41 2017
> @@ -60,9 +60,10 @@ class PassManagerBuilder {
> 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 @@ public:
> /// 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 @@ public:
> /// 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);
> }
> };
>
>
> Modified: llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp?rev=305303&r1=305302&r2=305303&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp Tue Jun 13 11:48:41 2017
> @@ -198,10 +198,9 @@ PassManagerBuilder::~PassManagerBuilder(
> 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) {
>
> Modified: llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt?rev=305303&r1=305302&r2=305303&view=diff
> ==============================================================================
> --- llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt (original)
> +++ llvm/trunk/unittests/Support/DynamicLibrary/CMakeLists.txt Tue Jun 13 11:48:41 2017
> @@ -1,4 +1,4 @@
> -set(LLVM_LINK_COMPONENTS Support)
> +set(LLVM_LINK_COMPONENTS Support IPO)
>
> add_library(DynamicLibraryLib STATIC ExportedFuncs.cxx)
>
>
> Modified: llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp?rev=305303&r1=305302&r2=305303&view=diff
> ==============================================================================
> --- llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp (original)
> +++ llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp Tue Jun 13 11:48:41 2017
> @@ -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 @@ template <class T> static void* PtrFunc(
> 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 : ""; }
>
> Modified: llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx?rev=305303&r1=305302&r2=305303&view=diff
> ==============================================================================
> --- llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx (original)
> +++ llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx Tue Jun 13 11:48:41 2017
> @@ -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 @@ extern "C" PIPSQUEAK_EXPORT void TestOrd
> 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);
> +}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170613/6356df27/attachment.html>
More information about the llvm-commits
mailing list