From 8962c68ad007a525f9daa987c99eda57e0d0069a Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames@gmail.com>
Date: Fri, 18 Jun 2021 22:12:39 +1000
Subject: [PATCH] [ORC][C-bindings] Re-order object transform function
 arguments.

ObjInOut is an in-out parameter not a return value argument, so by convention
it should come after the context value (Ctx).
---
 .../OrcV2CBindingsDumpObjects/OrcV2CBindingsDumpObjects.c       | 2 +-
 llvm/include/llvm-c/Orc.h                                       | 2 +-
 llvm/lib/ExecutionEngine/Orc/OrcV2CBindings.cpp                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/llvm/examples/OrcV2Examples/OrcV2CBindingsDumpObjects/OrcV2CBindingsDumpObjects.c b/llvm/examples/OrcV2Examples/OrcV2CBindingsDumpObjects/OrcV2CBindingsDumpObjects.c
index 1a90138d2036..bc063488f74b 100644
--- a/llvm/examples/OrcV2Examples/OrcV2CBindingsDumpObjects/OrcV2CBindingsDumpObjects.c
+++ b/llvm/examples/OrcV2Examples/OrcV2CBindingsDumpObjects/OrcV2CBindingsDumpObjects.c
@@ -51,7 +51,7 @@ LLVMOrcThreadSafeModuleRef createDemoModule() {
   return TSM;
 }
 
-LLVMErrorRef dumpObjectsTransform(LLVMMemoryBufferRef *ObjInOut, void *Ctx) {
+LLVMErrorRef dumpObjectsTransform(void *Ctx, LLVMMemoryBufferRef *ObjInOut) {
   LLVMOrcDumpObjectsRef DumpObjects = *(LLVMOrcDumpObjectsRef *)Ctx;
   return LLVMOrcDumpObjects_CallOperator(DumpObjects, ObjInOut);
 }
diff --git a/llvm/include/llvm-c/Orc.h b/llvm/include/llvm-c/Orc.h
index 4b942b2d12d2..6c7c9c9ee1f6 100644
--- a/llvm/include/llvm-c/Orc.h
+++ b/llvm/include/llvm-c/Orc.h
@@ -328,7 +328,7 @@ typedef struct LLVMOrcOpaqueObjectTransformLayer
  * buffer should be disposed of and set to null.
  */
 typedef LLVMErrorRef (*LLVMOrcObjectTransformLayerTransformFunction)(
-    LLVMMemoryBufferRef *ObjInOut, void *Ctx);
+    void *Ctx, LLVMMemoryBufferRef *ObjInOut);
 
 /**
  * A reference to an orc::DumpObjects object.
diff --git a/llvm/lib/ExecutionEngine/Orc/OrcV2CBindings.cpp b/llvm/lib/ExecutionEngine/Orc/OrcV2CBindings.cpp
index 71e260f8caf0..39e722f8358f 100644
--- a/llvm/lib/ExecutionEngine/Orc/OrcV2CBindings.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/OrcV2CBindings.cpp
@@ -524,7 +524,7 @@ void LLVMOrcObjectTransformLayerSetTransform(
       ->setTransform([TransformFunction, Ctx](std::unique_ptr<MemoryBuffer> Obj)
                          -> Expected<std::unique_ptr<MemoryBuffer>> {
         LLVMMemoryBufferRef ObjBuffer = wrap(Obj.release());
-        if (LLVMErrorRef Err = TransformFunction(&ObjBuffer, Ctx)) {
+        if (LLVMErrorRef Err = TransformFunction(Ctx, &ObjBuffer)) {
           assert(!ObjBuffer && "ObjBuffer was not reset to null on error");
           return unwrap(Err);
         }