[compiler-rt] f6b513a - Revert "Add explicit symbol visibility macros to InstrProfData.inc (#110732)"

[Vassil Vassilev via llvm-commits]

Author: Vassil Vassilev
Date: 2024-10-28T08:57:57Z
New Revision: f6b513a7857cbcdb7df93079916e6bb8a00bd0b8

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

LOG: Revert "Add explicit symbol visibility macros to InstrProfData.inc (#110732)"

This reverts commit d7ca703eab7997814de425eaa4fd888563d78831 in llvm/llvm-project#110732

Added: 
    

Modified: 
    compiler-rt/include/profile/InstrProfData.inc
    llvm/include/llvm/ProfileData/InstrProfData.inc

Removed: 
    


################################################################################
diff  --git a/compiler-rt/include/profile/InstrProfData.inc b/compiler-rt/include/profile/InstrProfData.inc
index 08ecaf0ed9fa5b..c66b0465a0b548 100644
--- a/compiler-rt/include/profile/InstrProfData.inc
+++ b/compiler-rt/include/profile/InstrProfData.inc
@@ -62,15 +62,6 @@
 #define INSTR_PROF_VISIBILITY
 #endif
 
-/* This include is needed for symbol visibility macros used on
- * ValueProfRecord\ValueProfData so there functions are exported from the
- * LLVM shared library on windows. */
-#ifdef __cplusplus
-#include "llvm/Support/Compiler.h"
-#else
-#define LLVM_ABI
-#endif
-
 // clang-format off:consider re-enabling clang-format if auto-formatted C macros
 // are readable (e.g., after `issue #82426` is fixed)
 /* INSTR_PROF_DATA start. */
@@ -382,7 +373,7 @@ INSTR_PROF_SECT_ENTRY(IPSK_covinit, \
  * This is the header of the data structure that defines the on-disk
  * layout of the value profile data of a particular kind for one function.
  */
-typedef struct LLVM_ABI ValueProfRecord {
+typedef struct ValueProfRecord {
   /* The kind of the value profile record. */
   uint32_t Kind;
   /*
@@ -432,7 +423,7 @@ typedef struct LLVM_ABI ValueProfRecord {
  * Per-function header/control data structure for value profiling
  * data in indexed format.
  */
-typedef struct LLVM_ABI ValueProfData {
+typedef struct ValueProfData {
   /*
    * Total size in bytes including this field. It must be a multiple
    * of sizeof(uint64_t).

diff  --git a/llvm/include/llvm/ProfileData/InstrProfData.inc b/llvm/include/llvm/ProfileData/InstrProfData.inc
index 08ecaf0ed9fa5b..c66b0465a0b548 100644
--- a/llvm/include/llvm/ProfileData/InstrProfData.inc
+++ b/llvm/include/llvm/ProfileData/InstrProfData.inc
@@ -62,15 +62,6 @@
 #define INSTR_PROF_VISIBILITY
 #endif
 
-/* This include is needed for symbol visibility macros used on
- * ValueProfRecord\ValueProfData so there functions are exported from the
- * LLVM shared library on windows. */
-#ifdef __cplusplus
-#include "llvm/Support/Compiler.h"
-#else
-#define LLVM_ABI
-#endif
-
 // clang-format off:consider re-enabling clang-format if auto-formatted C macros
 // are readable (e.g., after `issue #82426` is fixed)
 /* INSTR_PROF_DATA start. */
@@ -382,7 +373,7 @@ INSTR_PROF_SECT_ENTRY(IPSK_covinit, \
  * This is the header of the data structure that defines the on-disk
  * layout of the value profile data of a particular kind for one function.
  */
-typedef struct LLVM_ABI ValueProfRecord {
+typedef struct ValueProfRecord {
   /* The kind of the value profile record. */
   uint32_t Kind;
   /*
@@ -432,7 +423,7 @@ typedef struct LLVM_ABI ValueProfRecord {
  * Per-function header/control data structure for value profiling
  * data in indexed format.
  */
-typedef struct LLVM_ABI ValueProfData {
+typedef struct ValueProfData {
   /*
    * Total size in bytes including this field. It must be a multiple
    * of sizeof(uint64_t).