commit c9dcd82823625f02137845abf4e3620e5a4fd798
author Priyanka Advani (xWF) <padvani@google.com> Thu Jul 17 15:45:36 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 17 15:45:39 2025 -0700
tree da181212409d0860eb314db2c3c27a70a050bf72
parent 0786aa555c92cc205bf1b5d0e58c59b81a77add5

Revert "Stop using the cached pid."

Revert submission 34620896-getpid-always-syscall

Reason for revert: Droidmonitor created revert due to b/432461376. Will be verifying through ABTD before submission.

Fix: 432461376

Reverted changes: /q/submissionid:34620896-getpid-always-syscall

Change-Id: I2b17ab1fe3b2611a7babc1d195c5a45b19cac57a

libc/bionic/__libc_init_main_thread.cpp

diff --git a/libc/bionic/__libc_init_main_thread.cpp b/libc/bionic/__libc_init_main_thread.cpp
index 41a9a5a..2824340 100644
--- a/libc/bionic/__libc_init_main_thread.cpp
+++ b/libc/bionic/__libc_init_main_thread.cpp
@@ -38,6 +38,7 @@
 #include "private/bionic_ssp.h"
 #include "pthread_internal.h"
 
+extern "C" pid_t __getpid();
 extern "C" int __set_tid_address(int* tid_address);
 
 // Declared in "private/bionic_ssp.h".
@@ -78,7 +79,7 @@
   __init_tcb(temp_tcb, &main_thread);
   __init_tcb_dtv(temp_tcb);
   __set_tls(&temp_tcb->tls_slot(0));
-  main_thread.tid = getpid();
+  main_thread.tid = __getpid();
   main_thread.set_cached_pid(main_thread.tid);
   main_thread.stack_top = reinterpret_cast<uintptr_t>(args.argv);
   main_thread.stack_bottom = 0;