Index: compiler-rt/trunk/lib/tsan/rtl/tsan_debugging.cc
===================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_debugging.cc
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_debugging.cc
@@ -139,14 +139,14 @@
 }
 
 SANITIZER_INTERFACE_ATTRIBUTE
-int __tsan_get_report_thread(void *report, uptr idx, int *tid, uptr *pid,
+int __tsan_get_report_thread(void *report, uptr idx, int *tid, uptr *os_id,
                              int *running, const char **name, int *parent_tid,
                              void **trace, uptr trace_size) {
   const ReportDesc *rep = (ReportDesc *)report;
   CHECK_LT(idx, rep->threads.Size());
   ReportThread *thread = rep->threads[idx];
   *tid = thread->id;
-  *pid = thread->pid;
+  *os_id = thread->os_id;
   *running = thread->running;
   *name = thread->name;
   *parent_tid = thread->parent_tid;
Index: compiler-rt/trunk/lib/tsan/rtl/tsan_interface.h
===================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interface.h
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interface.h
@@ -124,7 +124,7 @@
 
 // Returns information about threads included in the report.
 SANITIZER_INTERFACE_ATTRIBUTE
-int __tsan_get_report_thread(void *report, uptr idx, int *tid, uptr *pid,
+int __tsan_get_report_thread(void *report, uptr idx, int *tid, uptr *os_id,
                              int *running, const char **name, int *parent_tid,
                              void **trace, uptr trace_size);
 
Index: compiler-rt/trunk/lib/tsan/rtl/tsan_report.h
===================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_report.h
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_report.h
@@ -87,7 +87,7 @@
 
 struct ReportThread {
   int id;
-  uptr pid;
+  uptr os_id;
   bool running;
   char *name;
   int parent_tid;
Index: compiler-rt/trunk/lib/tsan/rtl/tsan_report.cc
===================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_report.cc
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_report.cc
@@ -236,7 +236,7 @@
     Printf(" '%s'", rt->name);
   char thrbuf[kThreadBufSize];
   Printf(" (tid=%zu, %s) created by %s",
-    rt->pid, rt->running ? "running" : "finished",
+    rt->os_id, rt->running ? "running" : "finished",
     thread_name(thrbuf, rt->parent_tid));
   if (rt->stack)
     Printf(" at:");
Index: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc
===================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc
@@ -194,7 +194,7 @@
   ReportThread *rt = new(mem) ReportThread;
   rep_->threads.PushBack(rt);
   rt->id = tctx->tid;
-  rt->pid = tctx->os_id;
+  rt->os_id = tctx->os_id;
   rt->running = (tctx->status == ThreadStatusRunning);
   rt->name = internal_strdup(tctx->name);
   rt->parent_tid = tctx->parent_tid;
Index: compiler-rt/trunk/test/tsan/debugging.cc
===================================================================
--- compiler-rt/trunk/test/tsan/debugging.cc
+++ compiler-rt/trunk/test/tsan/debugging.cc
@@ -20,7 +20,7 @@
                           void **addr, int *size, int *write, int *atomic,
                           void **trace, unsigned long trace_size);
 int __tsan_get_report_thread(void *report, unsigned long idx, int *tid,
-                             unsigned long *pid, int *running,
+                             unsigned long *os_id, int *running,
                              const char **name, int *parent_tid, void **trace,
                              unsigned long trace_size);
 }
@@ -90,16 +90,16 @@
   fprintf(stderr, "thread_count = %d\n", thread_count);
   // CHECK: thread_count = 2
 
-  unsigned long pid;
+  unsigned long os_id;
   int running;
   const char *name;
   int parent_tid;
 
-  __tsan_get_report_thread(report, 0, &tid, &pid, &running, &name, &parent_tid, trace, 16);
+  __tsan_get_report_thread(report, 0, &tid, &os_id, &running, &name, &parent_tid, trace, 16);
   fprintf(stderr, "tid = %d\n", tid);
   // CHECK: tid = 1
 
-  __tsan_get_report_thread(report, 1, &tid, &pid, &running, &name, &parent_tid, trace, 16);
+  __tsan_get_report_thread(report, 1, &tid, &os_id, &running, &name, &parent_tid, trace, 16);
   fprintf(stderr, "tid = %d\n", tid);
   // CHECK: tid = 0
 }