<div dir="ltr">Bit awkward having mixed naming conventions (eg: __orc_rt_jit_dispatch V __orc_rt_DisposeCWrapperFunctionResult - the latter having both a different convention from the former, but also a different convention in different parts of the same name) - might be nice to standardize on all lower with underscores for these sort of names?</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jun 1, 2021 at 11:26 AM Lang Hames via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Lang Hames<br>
Date: 2021-06-01T11:24:19-07:00<br>
New Revision: 28c3e9c0d150591105511d4aa8064e9366da0df7<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/28c3e9c0d150591105511d4aa8064e9366da0df7" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/28c3e9c0d150591105511d4aa8064e9366da0df7</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/28c3e9c0d150591105511d4aa8064e9366da0df7.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/28c3e9c0d150591105511d4aa8064e9366da0df7.diff</a><br>
<br>
LOG: [ORC-RT] Rename C-API functions to use __orc_rt_ prefix (instead of OrcRT).<br>
<br>
This matches the C++ namespace name, and is consistent with other C linkage<br>
functions (e.g. __orc_rt_jit_dispatch).<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    compiler-rt/lib/orc/c_api.h<br>
    compiler-rt/lib/orc/common.h<br>
    compiler-rt/lib/orc/unittests/c_api_test.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/compiler-rt/lib/orc/c_api.h b/compiler-rt/lib/orc/c_api.h<br>
index ac8d3442e7bb7..0bfc7b6597e17 100644<br>
--- a/compiler-rt/lib/orc/c_api.h<br>
+++ b/compiler-rt/lib/orc/c_api.h<br>
@@ -50,18 +50,19 @@ ORC_RT_C_EXTERN_C_BEGIN<br>
 typedef union {<br>
   const char *ValuePtr;<br>
   char Value[sizeof(ValuePtr)];<br>
-} OrcRTCWrapperFunctionResultDataUnion;<br>
+} __orc_rt_CWrapperFunctionResultDataUnion;<br>
<br>
 /**<br>
- * OrcRTCWrapperFunctionResult is a kind of C-SmallVector with an out-of-band<br>
- * error state.<br>
+ * __orc_rt_CWrapperFunctionResult is a kind of C-SmallVector with an<br>
+ * out-of-band error state.<br>
  *<br>
  * If Size == 0 and Data.ValuePtr is non-zero then the value is in the<br>
  * 'out-of-band error' state, and Data.ValuePtr points at a malloc-allocated,<br>
  * null-terminated string error message.<br>
  *<br>
- * If Size <= sizeof(OrcRTCWrapperFunctionResultData) then the value is in the<br>
- * 'small' state and the content is held in the first Size bytes of Data.Value.<br>
+ * If Size <= sizeof(__orc_rt_CWrapperFunctionResultData) then the value is in<br>
+ * the 'small' state and the content is held in the first Size bytes of<br>
+ * Data.Value.<br>
  *<br>
  * If Size > sizeof(OrtRTCWrapperFunctionResultData) then the value is in the<br>
  * 'large' state and the content is held in the first Size bytes of the<br>
@@ -69,29 +70,29 @@ typedef union {<br>
  * malloc, and will be freed with free when this value is destroyed.<br>
  */<br>
 typedef struct {<br>
-  OrcRTCWrapperFunctionResultDataUnion Data;<br>
+  __orc_rt_CWrapperFunctionResultDataUnion Data;<br>
   size_t Size;<br>
-} OrcRTCWrapperFunctionResult;<br>
+} __orc_rt_CWrapperFunctionResult;<br>
<br>
-typedef struct OrcRTCSharedOpaqueJITProcessControl<br>
-    *OrcRTSharedJITProcessControlRef;<br>
+typedef struct __orc_rt_CSharedOpaqueJITProcessControl<br>
+    *__orc_rt_SharedJITProcessControlRef;<br>
<br>
 /**<br>
- * Zero-initialize an OrcRTCWrapperFunctionResult.<br>
+ * Zero-initialize an __orc_rt_CWrapperFunctionResult.<br>
  */<br>
 static inline void<br>
-OrcRTCWrapperFunctionResultInit(OrcRTCWrapperFunctionResult *R) {<br>
+__orc_rt_CWrapperFunctionResultInit(__orc_rt_CWrapperFunctionResult *R) {<br>
   R->Size = 0;<br>
   R->Data.ValuePtr = 0;<br>
 }<br>
<br>
 /**<br>
- * Create an OrcRTCWrapperFunctionResult with an uninitialized buffer of size<br>
- * Size. The buffer is returned via the DataPtr argument.<br>
+ * Create an __orc_rt_CWrapperFunctionResult with an uninitialized buffer of<br>
+ * size Size. The buffer is returned via the DataPtr argument.<br>
  */<br>
 static inline char *<br>
-OrcRTCWrapperFunctionResultAllocate(OrcRTCWrapperFunctionResult *R,<br>
-                                    size_t Size) {<br>
+__orc_rt_CWrapperFunctionResultAllocate(__orc_rt_CWrapperFunctionResult *R,<br>
+                                        size_t Size) {<br>
   char *DataPtr;<br>
   R->Size = Size;<br>
   if (Size > sizeof(R->Data.Value)) {<br>
@@ -103,11 +104,11 @@ OrcRTCWrapperFunctionResultAllocate(OrcRTCWrapperFunctionResult *R,<br>
 }<br>
<br>
 /**<br>
- * Create an OrcRTWrapperFunctionResult from the given data range.<br>
+ * Create an __orc_rt_WrapperFunctionResult from the given data range.<br>
  */<br>
-static inline OrcRTCWrapperFunctionResult<br>
-OrcRTCreateCWrapperFunctionResultFromRange(const char *Data, size_t Size) {<br>
-  OrcRTCWrapperFunctionResult R;<br>
+static inline __orc_rt_CWrapperFunctionResult<br>
+__orc_rt_CreateCWrapperFunctionResultFromRange(const char *Data, size_t Size) {<br>
+  __orc_rt_CWrapperFunctionResult R;<br>
   R.Size = Size;<br>
   if (R.Size > sizeof(R.Data.Value)) {<br>
     char *Tmp = (char *)malloc(Size);<br>
@@ -119,27 +120,28 @@ OrcRTCreateCWrapperFunctionResultFromRange(const char *Data, size_t Size) {<br>
 }<br>
<br>
 /**<br>
- * Create an OrcRTCWrapperFunctionResult by copying the given string, including<br>
- * the null-terminator.<br>
+ * Create an __orc_rt_CWrapperFunctionResult by copying the given string,<br>
+ * including the null-terminator.<br>
  *<br>
  * This function copies the input string. The client is responsible for freeing<br>
  * the ErrMsg arg.<br>
  */<br>
-static inline OrcRTCWrapperFunctionResult<br>
-OrcRTCreateCWrapperFunctionResultFromString(const char *Source) {<br>
-  return OrcRTCreateCWrapperFunctionResultFromRange(Source, strlen(Source) + 1);<br>
+static inline __orc_rt_CWrapperFunctionResult<br>
+__orc_rt_CreateCWrapperFunctionResultFromString(const char *Source) {<br>
+  return __orc_rt_CreateCWrapperFunctionResultFromRange(Source,<br>
+                                                        strlen(Source) + 1);<br>
 }<br>
<br>
 /**<br>
- * Create an OrcRTCWrapperFunctionResult representing an out-of-band<br>
+ * Create an __orc_rt_CWrapperFunctionResult representing an out-of-band<br>
  * error.<br>
  *<br>
  * This function takes ownership of the string argument which must have been<br>
  * allocated with malloc.<br>
  */<br>
-static inline OrcRTCWrapperFunctionResult<br>
-OrcRTCreateCWrapperFunctionResultFromOutOfBandError(const char *ErrMsg) {<br>
-  OrcRTCWrapperFunctionResult R;<br>
+static inline __orc_rt_CWrapperFunctionResult<br>
+__orc_rt_CreateCWrapperFunctionResultFromOutOfBandError(const char *ErrMsg) {<br>
+  __orc_rt_CWrapperFunctionResult R;<br>
   R.Size = 0;<br>
   char *Tmp = (char *)malloc(strlen(ErrMsg) + 1);<br>
   strcpy(Tmp, ErrMsg);<br>
@@ -148,11 +150,11 @@ OrcRTCreateCWrapperFunctionResultFromOutOfBandError(const char *ErrMsg) {<br>
 }<br>
<br>
 /**<br>
- * This should be called to destroy OrcRTCWrapperFunctionResult values<br>
+ * This should be called to destroy __orc_rt_CWrapperFunctionResult values<br>
  * regardless of their state.<br>
  */<br>
 static inline void<br>
-OrcRTDisposeCWrapperFunctionResult(OrcRTCWrapperFunctionResult *R) {<br>
+__orc_rt_DisposeCWrapperFunctionResult(__orc_rt_CWrapperFunctionResult *R) {<br>
   if (R->Size > sizeof(R->Data.Value) ||<br>
       (R->Size == 0 && R->Data.ValuePtr))<br>
     free((void *)R->Data.ValuePtr);<br>
@@ -160,22 +162,22 @@ OrcRTDisposeCWrapperFunctionResult(OrcRTCWrapperFunctionResult *R) {<br>
<br>
 /**<br>
  * Get a pointer to the data contained in the given<br>
- * OrcRTCWrapperFunctionResult.<br>
+ * __orc_rt_CWrapperFunctionResult.<br>
  */<br>
 static inline const char *<br>
-OrcRTCWrapperFunctionResultData(const OrcRTCWrapperFunctionResult *R) {<br>
+__orc_rt_CWrapperFunctionResultData(const __orc_rt_CWrapperFunctionResult *R) {<br>
   assert((R->Size != 0 || R->Data.ValuePtr == nullptr) &&<br>
          "Cannot get data for out-of-band error value");<br>
   return R->Size > sizeof(R->Data.Value) ? R->Data.ValuePtr : R->Data.Value;<br>
 }<br>
<br>
 /**<br>
- * Safely get the size of the given OrcRTCWrapperFunctionResult.<br>
+ * Safely get the size of the given __orc_rt_CWrapperFunctionResult.<br>
  *<br>
  * Asserts that we're not trying to access the size of an error value.<br>
  */<br>
 static inline size_t<br>
-OrcRTCWrapperFunctionResultSize(const OrcRTCWrapperFunctionResult *R) {<br>
+__orc_rt_CWrapperFunctionResultSize(const __orc_rt_CWrapperFunctionResult *R) {<br>
   assert((R->Size != 0 || R->Data.ValuePtr == nullptr) &&<br>
          "Cannot get size for out-of-band error value");<br>
   return R->Size;<br>
@@ -183,22 +185,22 @@ OrcRTCWrapperFunctionResultSize(const OrcRTCWrapperFunctionResult *R) {<br>
<br>
 /**<br>
  * Returns 1 if this value is equivalent to a value just initialized by<br>
- * OrcRTCWrapperFunctionResultInit, 0 otherwise.<br>
+ * __orc_rt_CWrapperFunctionResultInit, 0 otherwise.<br>
  */<br>
 static inline size_t<br>
-OrcRTCWrapperFunctionResultEmpty(const OrcRTCWrapperFunctionResult *R) {<br>
+__orc_rt_CWrapperFunctionResultEmpty(const __orc_rt_CWrapperFunctionResult *R) {<br>
   return R->Size == 0 && R->Data.ValuePtr == 0;<br>
 }<br>
<br>
 /**<br>
  * Returns a pointer to the out-of-band error string for this<br>
- * OrcRTCWrapperFunctionResult, or null if there is no error.<br>
+ * __orc_rt_CWrapperFunctionResult, or null if there is no error.<br>
  *<br>
- * The OrcRTCWrapperFunctionResult retains ownership of the error<br>
+ * The __orc_rt_CWrapperFunctionResult retains ownership of the error<br>
  * string, so it should be copied if the caller wishes to preserve it.<br>
  */<br>
-static inline const char *OrcRTCWrapperFunctionResultGetOutOfBandError(<br>
-    const OrcRTCWrapperFunctionResult *R) {<br>
+static inline const char *__orc_rt_CWrapperFunctionResultGetOutOfBandError(<br>
+    const __orc_rt_CWrapperFunctionResult *R) {<br>
   return R->Size == 0 ? R->Data.ValuePtr : 0;<br>
 }<br>
<br>
<br>
diff  --git a/compiler-rt/lib/orc/common.h b/compiler-rt/lib/orc/common.h<br>
index 90ee5c559ac27..bc64366a477a7 100644<br>
--- a/compiler-rt/lib/orc/common.h<br>
+++ b/compiler-rt/lib/orc/common.h<br>
@@ -34,7 +34,7 @@ extern "C" __orc_rt_Opaque __orc_rt_jit_dispatch_ctx<br>
 /// This is declared for use by the runtime, but should be implemented in the<br>
 /// executor or provided by a definition added to the JIT before the runtime<br>
 /// is loaded.<br>
-extern "C" OrcRTCWrapperFunctionResult<br>
+extern "C" __orc_rt_CWrapperFunctionResult<br>
 __orc_rt_jit_dispatch(__orc_rt_Opaque *DispatchCtx, const void *FnTag,<br>
                       const char *Data, size_t Size)<br>
   __attribute__((weak_import));<br>
<br>
diff  --git a/compiler-rt/lib/orc/unittests/c_api_test.cpp b/compiler-rt/lib/orc/unittests/c_api_test.cpp<br>
index 14009818218c5..4583feb98a136 100644<br>
--- a/compiler-rt/lib/orc/unittests/c_api_test.cpp<br>
+++ b/compiler-rt/lib/orc/unittests/c_api_test.cpp<br>
@@ -14,24 +14,24 @@<br>
 #include "gtest/gtest.h"<br>
<br>
 TEST(CAPITest, CWrapperFunctionResultInit) {<br>
-  OrcRTCWrapperFunctionResult R;<br>
-  OrcRTCWrapperFunctionResultInit(&R);<br>
+  __orc_rt_CWrapperFunctionResult R;<br>
+  __orc_rt_CWrapperFunctionResultInit(&R);<br>
<br>
   EXPECT_EQ(R.Size, 0U);<br>
   EXPECT_EQ(R.Data.ValuePtr, nullptr);<br>
<br>
   // Check that this value isn't treated as an out-of-band error.<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
<br>
   // Check that we can dispose of the value.<br>
-  OrcRTDisposeCWrapperFunctionResult(&R);<br>
+  __orc_rt_DisposeCWrapperFunctionResult(&R);<br>
 }<br>
<br>
 TEST(CAPITest, CWrapperFunctionResultAllocSmall) {<br>
   constexpr size_t SmallAllocSize = sizeof(const char *);<br>
<br>
-  OrcRTCWrapperFunctionResult R;<br>
-  char *DataPtr = OrcRTCWrapperFunctionResultAllocate(&R, SmallAllocSize);<br>
+  __orc_rt_CWrapperFunctionResult R;<br>
+  char *DataPtr = __orc_rt_CWrapperFunctionResultAllocate(&R, SmallAllocSize);<br>
<br>
   for (size_t I = 0; I != SmallAllocSize; ++I)<br>
     DataPtr[I] = 0x55 + I;<br>
@@ -44,24 +44,24 @@ TEST(CAPITest, CWrapperFunctionResultAllocSmall) {<br>
         << "Unexpected value at index " << I;<br>
<br>
   // Check that this value isn't treated as an out-of-band error.<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
<br>
-  // Check that OrcRTCWrapperFunctionResult(Data|Result|Size) and<br>
-  // OrcRTCWrapperFunctionResultGetOutOfBandError behave as expected.<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultData(&R), R.Data.Value);<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultSize(&R), SmallAllocSize);<br>
-  EXPECT_FALSE(OrcRTCWrapperFunctionResultEmpty(&R));<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
+  // Check that __orc_rt_CWrapperFunctionResult(Data|Result|Size) and<br>
+  // __orc_rt_CWrapperFunctionResultGetOutOfBandError behave as expected.<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultData(&R), R.Data.Value);<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultSize(&R), SmallAllocSize);<br>
+  EXPECT_FALSE(__orc_rt_CWrapperFunctionResultEmpty(&R));<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
<br>
   // Check that we can dispose of the value.<br>
-  OrcRTDisposeCWrapperFunctionResult(&R);<br>
+  __orc_rt_DisposeCWrapperFunctionResult(&R);<br>
 }<br>
<br>
 TEST(CAPITest, CWrapperFunctionResultAllocLarge) {<br>
   constexpr size_t LargeAllocSize = sizeof(const char *) + 1;<br>
<br>
-  OrcRTCWrapperFunctionResult R;<br>
-  char *DataPtr = OrcRTCWrapperFunctionResultAllocate(&R, LargeAllocSize);<br>
+  __orc_rt_CWrapperFunctionResult R;<br>
+  char *DataPtr = __orc_rt_CWrapperFunctionResultAllocate(&R, LargeAllocSize);<br>
<br>
   for (size_t I = 0; I != LargeAllocSize; ++I)<br>
     DataPtr[I] = 0x55 + I;<br>
@@ -75,17 +75,17 @@ TEST(CAPITest, CWrapperFunctionResultAllocLarge) {<br>
         << "Unexpected value at index " << I;<br>
<br>
   // Check that this value isn't treated as an out-of-band error.<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
<br>
-  // Check that OrcRTCWrapperFunctionResult(Data|Result|Size) and<br>
-  // OrcRTCWrapperFunctionResultGetOutOfBandError behave as expected.<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultData(&R), R.Data.ValuePtr);<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultSize(&R), LargeAllocSize);<br>
-  EXPECT_FALSE(OrcRTCWrapperFunctionResultEmpty(&R));<br>
-  EXPECT_EQ(OrcRTCWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
+  // Check that __orc_rt_CWrapperFunctionResult(Data|Result|Size) and<br>
+  // __orc_rt_CWrapperFunctionResultGetOutOfBandError behave as expected.<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultData(&R), R.Data.ValuePtr);<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultSize(&R), LargeAllocSize);<br>
+  EXPECT_FALSE(__orc_rt_CWrapperFunctionResultEmpty(&R));<br>
+  EXPECT_EQ(__orc_rt_CWrapperFunctionResultGetOutOfBandError(&R), nullptr);<br>
<br>
   // Check that we can dispose of the value.<br>
-  OrcRTDisposeCWrapperFunctionResult(&R);<br>
+  __orc_rt_DisposeCWrapperFunctionResult(&R);<br>
 }<br>
<br>
 TEST(CAPITest, CWrapperFunctionResultFromRangeSmall) {<br>
@@ -95,8 +95,8 @@ TEST(CAPITest, CWrapperFunctionResultFromRangeSmall) {<br>
   for (size_t I = 0; I != SmallAllocSize; ++I)<br>
     Source[I] = 0x55 + I;<br>
<br>
-  OrcRTCWrapperFunctionResult R =<br>
-      OrcRTCreateCWrapperFunctionResultFromRange(Source, SmallAllocSize);<br>
+  __orc_rt_CWrapperFunctionResult R =<br>
+      __orc_rt_CreateCWrapperFunctionResultFromRange(Source, SmallAllocSize);<br>
<br>
   // Check that the inline storage in R.Data.Value contains the expected<br>
   // sequence.<br>
@@ -106,7 +106,7 @@ TEST(CAPITest, CWrapperFunctionResultFromRangeSmall) {<br>
         << "Unexpected value at index " << I;<br>
<br>
   // Check that we can dispose of the value.<br>
-  OrcRTDisposeCWrapperFunctionResult(&R);<br>
+  __orc_rt_DisposeCWrapperFunctionResult(&R);<br>
 }<br>
<br>
 TEST(CAPITest, CWrapperFunctionResultFromRangeLarge) {<br>
@@ -116,8 +116,8 @@ TEST(CAPITest, CWrapperFunctionResultFromRangeLarge) {<br>
   for (size_t I = 0; I != LargeAllocSize; ++I)<br>
     Source[I] = 0x55 + I;<br>
<br>
-  OrcRTCWrapperFunctionResult R =<br>
-      OrcRTCreateCWrapperFunctionResultFromRange(Source, LargeAllocSize);<br>
+  __orc_rt_CWrapperFunctionResult R =<br>
+      __orc_rt_CreateCWrapperFunctionResultFromRange(Source, LargeAllocSize);<br>
<br>
   // Check that the inline storage in R.Data.Value contains the expected<br>
   // sequence.<br>
@@ -127,7 +127,7 @@ TEST(CAPITest, CWrapperFunctionResultFromRangeLarge) {<br>
         << "Unexpected value at index " << I;<br>
<br>
   // Check that we can dispose of the value.<br>
-  OrcRTDisposeCWrapperFunctionResult(&R);<br>
+  __orc_rt_DisposeCWrapperFunctionResult(&R);<br>
 }<br>
<br>
 TEST(CAPITest, CWrapperFunctionResultFromStringSmall) {<br>
@@ -138,8 +138,8 @@ TEST(CAPITest, CWrapperFunctionResultFromStringSmall) {<br>
     Source[I] = 'a' + I;<br>
   Source[SmallAllocSize - 1] = '\0';<br>
<br>
-  OrcRTCWrapperFunctionResult R =<br>
-      OrcRTCreateCWrapperFunctionResultFromString(Source);<br>
+  __orc_rt_CWrapperFunctionResult R =<br>
+      __orc_rt_CreateCWrapperFunctionResultFromString(Source);<br>
<br>
   // Check that the inline storage in R.Data.Value contains the expected<br>
   // sequence.<br>
@@ -151,7 +151,7 @@ TEST(CAPITest, CWrapperFunctionResultFromStringSmall) {<br>
       << "Unexpected value at index " << (SmallAllocSize - 1);<br>
<br>
   // Check that we can dispose of the value.<br>
-  OrcRTDisposeCWrapperFunctionResult(&R);<br>
+  __orc_rt_DisposeCWrapperFunctionResult(&R);<br>
 }<br>
<br>
 TEST(CAPITest, CWrapperFunctionResultFromStringLarge) {<br>
@@ -162,8 +162,8 @@ TEST(CAPITest, CWrapperFunctionResultFromStringLarge) {<br>
     Source[I] = 'a' + I;<br>
   Source[LargeAllocSize - 1] = '\0';<br>
<br>
-  OrcRTCWrapperFunctionResult R =<br>
-      OrcRTCreateCWrapperFunctionResultFromString(Source);<br>
+  __orc_rt_CWrapperFunctionResult R =<br>
+      __orc_rt_CreateCWrapperFunctionResultFromString(Source);<br>
<br>
   // Check that the inline storage in R.Data.Value contains the expected<br>
   // sequence.<br>
@@ -175,26 +175,26 @@ TEST(CAPITest, CWrapperFunctionResultFromStringLarge) {<br>
       << "Unexpected value at index " << (LargeAllocSize - 1);<br>
<br>
   // Check that we can dispose of the value.<br>
-  OrcRTDisposeCWrapperFunctionResult(&R);<br>
+  __orc_rt_DisposeCWrapperFunctionResult(&R);<br>
 }<br>
<br>
 TEST(CAPITest, CWrapperFunctionResultFromOutOfBandError) {<br>
   constexpr const char *ErrMsg = "test error message";<br>
-  OrcRTCWrapperFunctionResult R =<br>
-      OrcRTCreateCWrapperFunctionResultFromOutOfBandError(ErrMsg);<br>
+  __orc_rt_CWrapperFunctionResult R =<br>
+      __orc_rt_CreateCWrapperFunctionResultFromOutOfBandError(ErrMsg);<br>
<br>
 #ifndef NDEBUG<br>
-  EXPECT_DEATH({ OrcRTCWrapperFunctionResultData(&R); },<br>
+  EXPECT_DEATH({ __orc_rt_CWrapperFunctionResultData(&R); },<br>
                "Cannot get data for out-of-band error value");<br>
-  EXPECT_DEATH({ OrcRTCWrapperFunctionResultSize(&R); },<br>
+  EXPECT_DEATH({ __orc_rt_CWrapperFunctionResultSize(&R); },<br>
                "Cannot get size for out-of-band error value");<br>
 #endif<br>
<br>
-  EXPECT_FALSE(OrcRTCWrapperFunctionResultEmpty(&R));<br>
-  const char *OOBErrMsg = OrcRTCWrapperFunctionResultGetOutOfBandError(&R);<br>
+  EXPECT_FALSE(__orc_rt_CWrapperFunctionResultEmpty(&R));<br>
+  const char *OOBErrMsg = __orc_rt_CWrapperFunctionResultGetOutOfBandError(&R);<br>
   EXPECT_NE(OOBErrMsg, nullptr);<br>
   EXPECT_NE(OOBErrMsg, ErrMsg);<br>
   EXPECT_TRUE(strcmp(OOBErrMsg, ErrMsg) == 0);<br>
<br>
-  OrcRTDisposeCWrapperFunctionResult(&R);<br>
+  __orc_rt_DisposeCWrapperFunctionResult(&R);<br>
 }<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>