Re-apply "[ORC] Remove the Triple argument from LLJITBuilder::..." with fixes.

This re-applies f905bf3, which was reverted in
c861c1a due to compiler errors, with a fix for
MLIR.

Author: lhames

llvm/examples/OrcV2Examples/LLJITWithCustomObjectLinkingLayer/LLJITWithCustomObjectLinkingLayer.cpp

@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
       LLJITBuilder()
           .setJITTargetMachineBuilder(std::move(JTMB))
           .setObjectLinkingLayerCreator(
-              [&](ExecutionSession &ES, const Triple &TT) {
+              [&](ExecutionSession &ES) {
                 return std::make_unique<ObjectLinkingLayer>(
                     ES, ExitOnErr(jitlink::InProcessMemoryManager::Create()));
               })

llvm/examples/OrcV2Examples/LLJITWithGDBRegistrationListener/LLJITWithGDBRegistrationListener.cpp

@@ -62,8 +62,7 @@ int main(int argc, char *argv[]) {
   auto J =
       ExitOnErr(LLJITBuilder()
                     .setJITTargetMachineBuilder(std::move(JTMB))
-                    .setObjectLinkingLayerCreator([&](ExecutionSession &ES,
-                                                      const Triple &TT) {
+                    .setObjectLinkingLayerCreator([&](ExecutionSession &ES) {
                       auto GetMemMgr = []() {
                         return std::make_unique<SectionMemoryManager>();
                       };

llvm/examples/OrcV2Examples/LLJITWithObjectLinkingLayerPlugin/LLJITWithObjectLinkingLayerPlugin.cpp

@@ -207,7 +207,7 @@ int main(int argc, char *argv[]) {
       LLJITBuilder()
           .setJITTargetMachineBuilder(std::move(JTMB))
           .setObjectLinkingLayerCreator(
-              [&](ExecutionSession &ES, const Triple &TT) {
+              [&](ExecutionSession &ES) {
                 // Create ObjectLinkingLayer.
                 auto ObjLinkingLayer = std::make_unique<ObjectLinkingLayer>(
                     ES, ExitOnErr(jitlink::InProcessMemoryManager::Create()));

llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h

@@ -299,8 +299,7 @@ class LLLazyJIT : public LLJIT {
 class LLJITBuilderState {
 public:
   using ObjectLinkingLayerCreator =
-      std::function<Expected<std::unique_ptr<ObjectLayer>>(ExecutionSession &,
-                                                           const Triple &)>;
+      std::function<Expected<std::unique_ptr<ObjectLayer>>(ExecutionSession &)>;
 
   using CompileFunctionCreator =
       std::function<Expected<std::unique_ptr<IRCompileLayer::IRCompiler>>(

llvm/lib/ExecutionEngine/Orc/LLJIT.cpp

@@ -832,8 +832,7 @@ Error LLJITBuilderState::prepareForConstruction() {
         JTMB->setCodeModel(CodeModel::Small);
       JTMB->setRelocationModel(Reloc::PIC_);
       CreateObjectLinkingLayer =
-          [](ExecutionSession &ES,
-             const Triple &) -> Expected<std::unique_ptr<ObjectLayer>> {
+          [](ExecutionSession &ES) -> Expected<std::unique_ptr<ObjectLayer>> {
         return std::make_unique<ObjectLinkingLayer>(ES);
       };
     }
@@ -951,7 +950,7 @@ LLJIT::createObjectLinkingLayer(LLJITBuilderState &S, ExecutionSession &ES) {
 
   // If the config state provided an ObjectLinkingLayer factory then use it.
   if (S.CreateObjectLinkingLayer)
-    return S.CreateObjectLinkingLayer(ES, S.JTMB->getTargetTriple());
+    return S.CreateObjectLinkingLayer(ES);
 
   // Otherwise default to creating an RTDyldObjectLinkingLayer that constructs
   // a new SectionMemoryManager for each object.

llvm/lib/ExecutionEngine/Orc/OrcV2CBindings.cpp

@@ -911,12 +911,11 @@ void LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(
 void LLVMOrcLLJITBuilderSetObjectLinkingLayerCreator(
     LLVMOrcLLJITBuilderRef Builder,
     LLVMOrcLLJITBuilderObjectLinkingLayerCreatorFunction F, void *Ctx) {
-  unwrap(Builder)->setObjectLinkingLayerCreator(
-      [=](ExecutionSession &ES, const Triple &TT) {
-        auto TTStr = TT.str();
-        return std::unique_ptr<ObjectLayer>(
-            unwrap(F(Ctx, wrap(&ES), TTStr.c_str())));
-      });
+  unwrap(Builder)->setObjectLinkingLayerCreator([=](ExecutionSession &ES) {
+    auto TTStr = ES.getTargetTriple().str();
+    return std::unique_ptr<ObjectLayer>(
+        unwrap(F(Ctx, wrap(&ES), TTStr.c_str())));
+  });
 }
 
 LLVMErrorRef LLVMOrcCreateLLJIT(LLVMOrcLLJITRef *Result,

llvm/tools/lli/lli.cpp

@@ -1031,10 +1031,9 @@ int runOrcJIT(const char *ProgName) {
     Builder.getJITTargetMachineBuilder()
         ->setRelocationModel(Reloc::PIC_)
         .setCodeModel(CodeModel::Small);
-    Builder.setObjectLinkingLayerCreator(
-        [&](orc::ExecutionSession &ES, const Triple &TT) {
-          return std::make_unique<orc::ObjectLinkingLayer>(ES);
-        });
+    Builder.setObjectLinkingLayerCreator([&](orc::ExecutionSession &ES) {
+      return std::make_unique<orc::ObjectLinkingLayer>(ES);
+    });
   }
 
   auto J = ExitOnErr(Builder.create());

mlir/lib/ExecutionEngine/ExecutionEngine.cpp

@@ -313,8 +313,7 @@ ExecutionEngine::create(Operation *m, const ExecutionEngineOptions &options,
 
   // Callback to create the object layer with symbol resolution to current
   // process and dynamically linked libraries.
-  auto objectLinkingLayerCreator = [&](ExecutionSession &session,
-                                       const Triple &tt) {
+  auto objectLinkingLayerCreator = [&](ExecutionSession &session) {
     auto objectLayer = std::make_unique<RTDyldObjectLinkingLayer>(
         session, [sectionMemoryMapper = options.sectionMemoryMapper]() {
           return std::make_unique<SectionMemoryManager>(sectionMemoryMapper);