Skip to content

Commit f6b513a

Browse files
committed
Revert "Add explicit symbol visibility macros to InstrProfData.inc (#110732)"
This reverts commit d7ca703 in #110732
1 parent 3d6923d commit f6b513a

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

compiler-rt/include/profile/InstrProfData.inc

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@
6262
#define INSTR_PROF_VISIBILITY
6363
#endif
6464

65-
/* This include is needed for symbol visibility macros used on
66-
* ValueProfRecord\ValueProfData so there functions are exported from the
67-
* LLVM shared library on windows. */
68-
#ifdef __cplusplus
69-
#include "llvm/Support/Compiler.h"
70-
#else
71-
#define LLVM_ABI
72-
#endif
73-
7465
// clang-format off:consider re-enabling clang-format if auto-formatted C macros
7566
// are readable (e.g., after `issue #82426` is fixed)
7667
/* INSTR_PROF_DATA start. */
@@ -382,7 +373,7 @@ INSTR_PROF_SECT_ENTRY(IPSK_covinit, \
382373
* This is the header of the data structure that defines the on-disk
383374
* layout of the value profile data of a particular kind for one function.
384375
*/
385-
typedef struct LLVM_ABI ValueProfRecord {
376+
typedef struct ValueProfRecord {
386377
/* The kind of the value profile record. */
387378
uint32_t Kind;
388379
/*
@@ -432,7 +423,7 @@ typedef struct LLVM_ABI ValueProfRecord {
432423
* Per-function header/control data structure for value profiling
433424
* data in indexed format.
434425
*/
435-
typedef struct LLVM_ABI ValueProfData {
426+
typedef struct ValueProfData {
436427
/*
437428
* Total size in bytes including this field. It must be a multiple
438429
* of sizeof(uint64_t).

llvm/include/llvm/ProfileData/InstrProfData.inc

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@
6262
#define INSTR_PROF_VISIBILITY
6363
#endif
6464

65-
/* This include is needed for symbol visibility macros used on
66-
* ValueProfRecord\ValueProfData so there functions are exported from the
67-
* LLVM shared library on windows. */
68-
#ifdef __cplusplus
69-
#include "llvm/Support/Compiler.h"
70-
#else
71-
#define LLVM_ABI
72-
#endif
73-
7465
// clang-format off:consider re-enabling clang-format if auto-formatted C macros
7566
// are readable (e.g., after `issue #82426` is fixed)
7667
/* INSTR_PROF_DATA start. */
@@ -382,7 +373,7 @@ INSTR_PROF_SECT_ENTRY(IPSK_covinit, \
382373
* This is the header of the data structure that defines the on-disk
383374
* layout of the value profile data of a particular kind for one function.
384375
*/
385-
typedef struct LLVM_ABI ValueProfRecord {
376+
typedef struct ValueProfRecord {
386377
/* The kind of the value profile record. */
387378
uint32_t Kind;
388379
/*
@@ -432,7 +423,7 @@ typedef struct LLVM_ABI ValueProfRecord {
432423
* Per-function header/control data structure for value profiling
433424
* data in indexed format.
434425
*/
435-
typedef struct LLVM_ABI ValueProfData {
426+
typedef struct ValueProfData {
436427
/*
437428
* Total size in bytes including this field. It must be a multiple
438429
* of sizeof(uint64_t).

0 commit comments

Comments
 (0)