[compiler-rt] ab3d5d0 - Revert "[compiler-rt/profile] Hide __llvm_profile_raw_version"

[Pirama Arumuga Nainar via llvm-commits]

Author: Pirama Arumuga Nainar
Date: 2021-10-21T10:56:43-07:00
New Revision: ab3d5d0533678ee93c93bd62db79c091741096f0

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

LOG: Revert "[compiler-rt/profile] Hide __llvm_profile_raw_version"

This reverts commit 69708477be258dbea2711f6a35c02685659b49d3 to unblock
instrprof-darwin-exports.c failure on MacOS bots.

Added: 
    

Modified: 
    compiler-rt/lib/profile/InstrProfiling.h
    compiler-rt/lib/profile/InstrProfilingVersionVar.c

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/profile/InstrProfiling.h b/compiler-rt/lib/profile/InstrProfiling.h
index 4c75edabb47cf..3fbee92ea5e4a 100644
--- a/compiler-rt/lib/profile/InstrProfiling.h
+++ b/compiler-rt/lib/profile/InstrProfiling.h
@@ -301,11 +301,14 @@ void __llvm_profile_set_dumped();
 COMPILER_RT_VISIBILITY extern int INSTR_PROF_PROFILE_RUNTIME_VAR;
 
 /*!
- * This variable is defined in InstrProfilingVersionVar.c as a hidden symbol.
- * Its main purpose is to encode the raw profile version value and other format
- * related information such as whether the profile is from IR based
- * instrumentation. The variable is defined as weak so that compiler can emit an
- * overriding definition depending on user option.
+ * This variable is defined in InstrProfiling.c. Its main purpose is to
+ * encode the raw profile version value and other format related information
+ * such as whether the profile is from IR based instrumentation. The variable
+ * is defined as weak so that compiler can emit an overriding definition
+ * depending on user option.  Since we don't support mixing FE and IR based
+ * data in the same raw profile data file (in other words, shared libs and
+ * main program are expected to be instrumented in the same way), there is
+ * no need for this variable to be hidden.
  */
 extern uint64_t INSTR_PROF_RAW_VERSION_VAR; /* __llvm_profile_raw_version */
 

diff  --git a/compiler-rt/lib/profile/InstrProfilingVersionVar.c b/compiler-rt/lib/profile/InstrProfilingVersionVar.c
index 21400bfb2caa0..a6f222150794d 100644
--- a/compiler-rt/lib/profile/InstrProfilingVersionVar.c
+++ b/compiler-rt/lib/profile/InstrProfilingVersionVar.c
@@ -14,5 +14,4 @@
  * user has not specified one. Set this up by moving the runtime's copy of this
  * symbol to an object file within the archive.
  */
-COMPILER_RT_VISIBILITY COMPILER_RT_WEAK uint64_t INSTR_PROF_RAW_VERSION_VAR =
-    INSTR_PROF_RAW_VERSION;
+COMPILER_RT_WEAK uint64_t INSTR_PROF_RAW_VERSION_VAR = INSTR_PROF_RAW_VERSION;