[llvm] [ORC] Merge MaterializationResponsibility notifyEmitted and addDepend… (PR #79952)

via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 31 10:34:22 PST 2024


github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff 59c9a48d5e19716e5df8d0f794e489891fd2c835 e6ffd3dfd171cd55b99e4a767753fc1d73ddba55 -- llvm/include/llvm-c/Orc.h llvm/include/llvm/ExecutionEngine/Orc/Core.h llvm/include/llvm/ExecutionEngine/Orc/DebugUtils.h llvm/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h llvm/lib/ExecutionEngine/Orc/Core.cpp llvm/lib/ExecutionEngine/Orc/DebugUtils.cpp llvm/lib/ExecutionEngine/Orc/IndirectionUtils.cpp llvm/lib/ExecutionEngine/Orc/LazyReexports.cpp llvm/lib/ExecutionEngine/Orc/ObjectLinkingLayer.cpp llvm/lib/ExecutionEngine/Orc/OrcV2CBindings.cpp llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp llvm/unittests/ExecutionEngine/Orc/CoreAPIsTest.cpp llvm/unittests/ExecutionEngine/Orc/LazyCallThroughAndReexportsTest.cpp llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp llvm/unittests/ExecutionEngine/Orc/ResourceTrackerTest.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Core.h b/llvm/include/llvm/ExecutionEngine/Orc/Core.h
index c24334b999..92524050e7 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Core.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Core.h
@@ -1814,9 +1814,9 @@ private:
       DenseMap<JITDylib::EmissionDepUnit *, JITDylib::EmissionDepUnitInfo>;
 
   template <typename HandleNewDepFn>
-  void propagateExtraEmitDeps(
-      std::deque<JITDylib::EmissionDepUnit *> Worklist, EDUInfosMap &EDUInfos,
-      HandleNewDepFn HandleNewDep);
+  void propagateExtraEmitDeps(std::deque<JITDylib::EmissionDepUnit *> Worklist,
+                              EDUInfosMap &EDUInfos,
+                              HandleNewDepFn HandleNewDep);
   EDUInfosMap simplifyDepGroups(MaterializationResponsibility &MR,
                                 ArrayRef<SymbolDependenceGroup> EmittedDeps);
   void IL_makeEDUReady(std::shared_ptr<JITDylib::EmissionDepUnit> EDU,
diff --git a/llvm/lib/ExecutionEngine/Orc/Core.cpp b/llvm/lib/ExecutionEngine/Orc/Core.cpp
index 6a17b90973..acfc5867c2 100644
--- a/llvm/lib/ExecutionEngine/Orc/Core.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/Core.cpp
@@ -2729,7 +2729,7 @@ void ExecutionSession::propagateExtraEmitDeps(
         DenseSet<NonOwningSymbolStringPtr> *UserEDUNewDepsForJD = nullptr;
         for (auto Dep : Deps) {
           if (UserEDUDepsForJD.insert(Dep).second) {
-	    HandleNewDep(*UserEDU, *DepJD, Dep);
+            HandleNewDep(*UserEDU, *DepJD, Dep);
             if (UserEDUInfo) {
               if (!UserEDUNewDepsForJD) {
                 // If UserEDU has no new deps then it's not in the worklist
@@ -2884,8 +2884,7 @@ ExecutionSession::EDUInfosMap ExecutionSession::simplifyDepGroups(
   // 4. Propagate dependencies through the EDU graph.
   propagateExtraEmitDeps(
       Worklist, EDUInfos,
-      [](JITDylib::EmissionDepUnit &, JITDylib &, NonOwningSymbolStringPtr) {
-      });
+      [](JITDylib::EmissionDepUnit &, JITDylib &, NonOwningSymbolStringPtr) {});
 
   return EDUInfos;
 }
@@ -3203,8 +3202,8 @@ ExecutionSession::IL_emit(MaterializationResponsibility &MR,
   propagateExtraEmitDeps(
       Worklist, EDUInfos,
       [](JITDylib::EmissionDepUnit &EDU, JITDylib &JD,
-	 NonOwningSymbolStringPtr Sym) {
-	JD.MaterializingInfos[SymbolStringPtr(Sym)].DependantEDUs.insert(&EDU);
+         NonOwningSymbolStringPtr Sym) {
+        JD.MaterializingInfos[SymbolStringPtr(Sym)].DependantEDUs.insert(&EDU);
       });
 
   JITDylib::AsynchronousSymbolQuerySet CompletedQueries;

``````````

</details>


https://github.com/llvm/llvm-project/pull/79952


More information about the llvm-commits mailing list