[llvm] b425f55 - [C-API][ORC] Fix struct name.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2022-06-13T13:53:51-07:00
New Revision: b425f556935c1105dea59871a46caa7af2d378ad

URL: https://github.com/llvm/llvm-project/commit/b425f556935c1105dea59871a46caa7af2d378ad
DIFF: https://github.com/llvm/llvm-project/commit/b425f556935c1105dea59871a46caa7af2d378ad.diff

LOG: [C-API][ORC] Fix struct name.

This struct was using the wrong prefix (LLVMJIT... vs LLVMOrc...).

Added: 
    

Modified: 
    llvm/include/llvm-c/Orc.h
    llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm-c/Orc.h b/llvm/include/llvm-c/Orc.h
index e2f30b7cdf45b..57478208a6d06 100644
--- a/llvm/include/llvm-c/Orc.h
+++ b/llvm/include/llvm-c/Orc.h
@@ -122,13 +122,13 @@ typedef LLVMOrcCSymbolFlagsMapPair *LLVMOrcCSymbolFlagsMapPairs;
 typedef struct {
   LLVMOrcSymbolStringPoolEntryRef Name;
   LLVMJITEvaluatedSymbol Sym;
-} LLVMJITCSymbolMapPair;
+} LLVMOrcCSymbolMapPair;
 
 /**
  * Represents a list of (SymbolStringPtr, JITEvaluatedSymbol) pairs that can be
  * used to construct a SymbolMap.
  */
-typedef LLVMJITCSymbolMapPair *LLVMOrcCSymbolMapPairs;
+typedef LLVMOrcCSymbolMapPair *LLVMOrcCSymbolMapPairs;
 
 /**
  * Represents a SymbolAliasMapEntry

diff  --git a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
index 72faccd795b71..3a55efdb9a407 100644
--- a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
@@ -138,8 +138,8 @@ class OrcCAPITestBase : public testing::Test {
       LLVMJITSymbolFlags Flags = {LLVMJITSymbolGenericFlagsWeak, 0};
       LLVMJITEvaluatedSymbol Sym = {Addr, Flags};
       LLVMOrcRetainSymbolStringPoolEntry(Element.Name);
-      LLVMJITCSymbolMapPair Pair = {Element.Name, Sym};
-      LLVMJITCSymbolMapPair Pairs[] = {Pair};
+      LLVMOrcCSymbolMapPair Pair = {Element.Name, Sym};
+      LLVMOrcCSymbolMapPair Pairs[] = {Pair};
       LLVMOrcMaterializationUnitRef MU = LLVMOrcAbsoluteSymbols(Pairs, 1);
       LLVMErrorRef Err = LLVMOrcJITDylibDefine(JD, MU);
       if (Err)
@@ -252,8 +252,8 @@ TEST_F(OrcCAPITestBase, MaterializationUnitCreation) {
   LLVMOrcJITTargetAddress Addr =
       (LLVMOrcJITTargetAddress)(&materializationUnitFn);
   LLVMJITEvaluatedSymbol Sym = {Addr, Flags};
-  LLVMJITCSymbolMapPair Pair = {Name, Sym};
-  LLVMJITCSymbolMapPair Pairs[] = {Pair};
+  LLVMOrcCSymbolMapPair Pair = {Name, Sym};
+  LLVMOrcCSymbolMapPair Pairs[] = {Pair};
   LLVMOrcMaterializationUnitRef MU = LLVMOrcAbsoluteSymbols(Pairs, 1);
   LLVMOrcJITDylibDefine(MainDylib, MU);
   LLVMOrcJITTargetAddress OutAddr;
@@ -433,7 +433,7 @@ void Materialize(void *Ctx, LLVMOrcMaterializationResponsibilityRef MR) {
   }
   assert(OtherMR);
 
-  LLVMJITCSymbolMapPair OtherPair = {OtherSymbol, Sym};
+  LLVMOrcCSymbolMapPair OtherPair = {OtherSymbol, Sym};
   LLVMOrcMaterializationUnitRef OtherMU = LLVMOrcAbsoluteSymbols(&OtherPair, 1);
   // OtherSymbol is no longer owned by us
   {
@@ -474,7 +474,7 @@ void Materialize(void *Ctx, LLVMOrcMaterializationResponsibilityRef MR) {
   LLVMOrcMaterializationResponsibilityAddDependenciesForAll(MR, &Dependency, 1);
 
   // See FIXME above
-  LLVMJITCSymbolMapPair Pair = {DependencySymbol, Sym};
+  LLVMOrcCSymbolMapPair Pair = {DependencySymbol, Sym};
   LLVMOrcMaterializationResponsibilityNotifyResolved(MR, &Pair, 1);
   // DependencySymbol no longer owned by us