Skip to content

Commit ab3d5d0

Browse files
Revert "[compiler-rt/profile] Hide __llvm_profile_raw_version"
This reverts commit 6970847 to unblock instrprof-darwin-exports.c failure on MacOS bots.
1 parent d55be79 commit ab3d5d0

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

compiler-rt/lib/profile/InstrProfiling.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,14 @@ void __llvm_profile_set_dumped();
301301
COMPILER_RT_VISIBILITY extern int INSTR_PROF_PROFILE_RUNTIME_VAR;
302302

303303
/*!
304-
* This variable is defined in InstrProfilingVersionVar.c as a hidden symbol.
305-
* Its main purpose is to encode the raw profile version value and other format
306-
* related information such as whether the profile is from IR based
307-
* instrumentation. The variable is defined as weak so that compiler can emit an
308-
* overriding definition depending on user option.
304+
* This variable is defined in InstrProfiling.c. Its main purpose is to
305+
* encode the raw profile version value and other format related information
306+
* such as whether the profile is from IR based instrumentation. The variable
307+
* is defined as weak so that compiler can emit an overriding definition
308+
* depending on user option. Since we don't support mixing FE and IR based
309+
* data in the same raw profile data file (in other words, shared libs and
310+
* main program are expected to be instrumented in the same way), there is
311+
* no need for this variable to be hidden.
309312
*/
310313
extern uint64_t INSTR_PROF_RAW_VERSION_VAR; /* __llvm_profile_raw_version */
311314

compiler-rt/lib/profile/InstrProfilingVersionVar.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
* user has not specified one. Set this up by moving the runtime's copy of this
1515
* symbol to an object file within the archive.
1616
*/
17-
COMPILER_RT_VISIBILITY COMPILER_RT_WEAK uint64_t INSTR_PROF_RAW_VERSION_VAR =
18-
INSTR_PROF_RAW_VERSION;
17+
COMPILER_RT_WEAK uint64_t INSTR_PROF_RAW_VERSION_VAR = INSTR_PROF_RAW_VERSION;

0 commit comments

Comments
 (0)