Revert "[tsan] Keep thread/stack for closed FD"

Test is flaky.

This reverts commit e9c5bde88e.

compiler-rt/lib/tsan/rtl/tsan_fd.cpp

@@ -34,7 +34,6 @@ struct FdDesc {
   atomic_uintptr_t aux_sync;  // FdSync*
   Tid creation_tid;
   StackID creation_stack;
-  bool closed;
 };
 
 struct FdContext {
@@ -121,7 +120,6 @@ static void init(ThreadState *thr, uptr pc, int fd, FdSync *s,
   }
   d->creation_tid = thr->tid;
   d->creation_stack = CurrentStackId(thr, pc);
-  d->closed = false;
   // This prevents false positives on fd_close_norace3.cpp test.
   // The mechanics of the false positive are not completely clear,
   // but it happens only if global reset is enabled (flush_memory_ms=1)
@@ -157,7 +155,7 @@ void FdOnFork(ThreadState *thr, uptr pc) {
   }
 }
 
-bool FdLocation(uptr addr, int *fd, Tid *tid, StackID *stack, bool *closed) {
+bool FdLocation(uptr addr, int *fd, Tid *tid, StackID *stack) {
   for (int l1 = 0; l1 < kTableSizeL1; l1++) {
     FdDesc *tab = (FdDesc*)atomic_load(&fdctx.tab[l1], memory_order_relaxed);
     if (tab == 0)
@@ -168,7 +166,6 @@ bool FdLocation(uptr addr, int *fd, Tid *tid, StackID *stack, bool *closed) {
       *fd = l1 * kTableSizeL1 + l2;
       *tid = d->creation_tid;
       *stack = d->creation_stack;
-      *closed = d->closed;
       return true;
     }
   }
@@ -245,9 +242,8 @@ void FdClose(ThreadState *thr, uptr pc, int fd, bool write) {
         reinterpret_cast<FdSync *>(
             atomic_load(&d->aux_sync, memory_order_relaxed)));
   atomic_store(&d->aux_sync, 0, memory_order_relaxed);
-  d->closed = true;
-  d->creation_tid = thr->tid;
-  d->creation_stack = CurrentStackId(thr, pc);
+  d->creation_tid = kInvalidTid;
+  d->creation_stack = kInvalidStackID;
 }
 
 void FdFileCreate(ThreadState *thr, uptr pc, int fd) {

compiler-rt/lib/tsan/rtl/tsan_fd.h

@@ -54,7 +54,7 @@ void FdSocketCreate(ThreadState *thr, uptr pc, int fd);
 void FdSocketAccept(ThreadState *thr, uptr pc, int fd, int newfd);
 void FdSocketConnecting(ThreadState *thr, uptr pc, int fd);
 void FdSocketConnect(ThreadState *thr, uptr pc, int fd);
-bool FdLocation(uptr addr, int *fd, Tid *tid, StackID *stack, bool *closed);
+bool FdLocation(uptr addr, int *fd, Tid *tid, StackID *stack);
 void FdOnFork(ThreadState *thr, uptr pc);
 
 uptr File2addr(const char *path);

compiler-rt/lib/tsan/rtl/tsan_report.cpp

@@ -200,9 +200,8 @@ static void PrintLocation(const ReportLocation *loc) {
   } else if (loc->type == ReportLocationTLS) {
     Printf("  Location is TLS of %s.\n\n", thread_name(thrbuf, loc->tid));
   } else if (loc->type == ReportLocationFD) {
-    Printf("  Location is file descriptor %d %s by %s at:\n", loc->fd,
-           loc->fd_closed ? "destroyed" : "created",
-           thread_name(thrbuf, loc->tid));
+    Printf("  Location is file descriptor %d created by %s at:\n",
+        loc->fd, thread_name(thrbuf, loc->tid));
     print_stack = true;
   }
   Printf("%s", d.Default());

compiler-rt/lib/tsan/rtl/tsan_report.h

@@ -76,7 +76,6 @@ struct ReportLocation {
   uptr external_tag = 0;
   Tid tid = kInvalidTid;
   int fd = 0;
-  bool fd_closed = false;
   bool suppressable = false;
   ReportStack *stack = nullptr;
 };

compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp

@@ -281,11 +281,9 @@ void ScopedReportBase::AddLocation(uptr addr, uptr size) {
   int fd = -1;
   Tid creat_tid = kInvalidTid;
   StackID creat_stack = 0;
-  bool closed = false;
-  if (FdLocation(addr, &fd, &creat_tid, &creat_stack, &closed)) {
+  if (FdLocation(addr, &fd, &creat_tid, &creat_stack)) {
     auto *loc = New<ReportLocation>();
     loc->type = ReportLocationFD;
-    loc->fd_closed = closed;
     loc->fd = fd;
     loc->tid = creat_tid;
     loc->stack = SymbolizeStackId(creat_stack);

compiler-rt/test/tsan/fd_location_closed.cpp

@@ -1,29 +0,0 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t |& FileCheck %s
-#include "test.h"
-
-#include <fcntl.h>
-
-void *Thread(void *x) {
-  int fd = (long)x;
-  char buf;
-  read(fd, &buf, 1);
-  barrier_wait(&barrier);
-  close(fd);
-  return NULL;
-}
-
-int main() {
-  barrier_init(&barrier, 2);
-  int fd = open("/dev/random", O_RDONLY);
-  pthread_t t[2];
-  pthread_create(&t[0], NULL, Thread, (void *)(long)fd);
-  pthread_create(&t[1], NULL, Thread, (void *)(long)fd);
-
-  pthread_join(t[0], NULL);
-  pthread_join(t[1], NULL);
-}
-
-// CHECK: WARNING: ThreadSanitizer: data race
-// CHECK:   Location is file descriptor {{[0-9]+}} destroyed by thread
-// CHECK:     #0 close
-// CHECK:     #1 Thread