commit 4ca4a72d28ffc612957b8c6a56f3caa12a904faf
author Wael Yehia <wyehia@ca.ibm.com> Thu Oct 27 14:37:26 2022 -0400
committer Copybara-Service <copybara-worker@google.com> Thu Oct 27 22:16:31 2022 -0700
tree 2b5f51c36154d8523764afe0f5bf730b48bf63b2
parent 8f592ee4e74e0314a21eb25c3889319342c3316a

[PGO] Simplify InstrProfilingRuntime.cpp

Differential Revision: https://reviews.llvm.org/D136192

GitOrigin-RevId: c8eb932ce6408e09c739097b325008c10797846d

lib/profile/InstrProfilingRuntime.cpp

diff --git a/lib/profile/InstrProfilingRuntime.cpp b/lib/profile/InstrProfilingRuntime.cpp
index 04f761c..6b2ce97 100644
--- a/lib/profile/InstrProfilingRuntime.cpp
+++ b/lib/profile/InstrProfilingRuntime.cpp
@@ -12,21 +12,13 @@
 
 static int RegisterRuntime() {
   __llvm_profile_initialize();
+#ifdef _AIX
+  extern COMPILER_RT_VISIBILITY void *__llvm_profile_keep[];
+  (void)*(void *volatile *)__llvm_profile_keep;
+#endif
   return 0;
 }
 
-#ifndef _AIX
 /* int __llvm_profile_runtime  */
-COMPILER_RT_VISIBILITY int INSTR_PROF_PROFILE_RUNTIME_VAR;
-
-static int Registration = RegisterRuntime();
-#else
-extern COMPILER_RT_VISIBILITY void *__llvm_profile_keep[];
-/* On AIX, when linking with -bcdtors:csect, the variable whose constructor does
- * the registration needs to be explicitly kept, hence we reuse the runtime hook
- * variable to do the registration since it'll be kept via the -u linker flag.
- * Create a volatile reference to __llvm_profile_keep to keep the array alive.*/
-COMPILER_RT_VISIBILITY int INSTR_PROF_PROFILE_RUNTIME_VAR =
-    ((void)*(void *volatile *)__llvm_profile_keep, RegisterRuntime());
-#endif
+COMPILER_RT_VISIBILITY int INSTR_PROF_PROFILE_RUNTIME_VAR = RegisterRuntime();
 }