From b582eb346ac7060c8ff71f9376dd5e362afc0d68 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 24 Dec 2020 18:43:26 +0300
Subject: [PATCH] Undo move_as_native_fd changes.

---
 tdutils/td/utils/port/StdStreams.cpp      | 1 -
 tdutils/td/utils/port/detail/PollableFd.h | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tdutils/td/utils/port/StdStreams.cpp b/tdutils/td/utils/port/StdStreams.cpp
index cc6d28b38..30603e1de 100644
--- a/tdutils/td/utils/port/StdStreams.cpp
+++ b/tdutils/td/utils/port/StdStreams.cpp
@@ -24,7 +24,6 @@ namespace td {
 template <int id>
 static FileFd &get_file_fd() {
   static FileFd result = FileFd::from_native_fd(NativeFd(id, true));
-  static ExitGuard exit_guard;
   static auto guard = ScopeExit() + [&] {
     result.move_as_native_fd().release();
   };
diff --git a/tdutils/td/utils/port/detail/PollableFd.h b/tdutils/td/utils/port/detail/PollableFd.h
index e03e00cd8..d8a0d8d7c 100644
--- a/tdutils/td/utils/port/detail/PollableFd.h
+++ b/tdutils/td/utils/port/detail/PollableFd.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "td/utils/common.h"
-#include "td/utils/ExitGuard.h"
 #include "td/utils/format.h"
 #include "td/utils/List.h"
 #include "td/utils/logging.h"
@@ -125,10 +124,8 @@ class PollableFdInfo : private ListNode {
 
   ~PollableFdInfo() {
     VLOG(fd) << native_fd() << " destroy PollableFdInfo";
-    if (!ExitGuard::is_exited()) {
-      bool was_locked = lock_.test_and_set(std::memory_order_acquire);
-      CHECK(!was_locked);
-    }
+    bool was_locked = lock_.test_and_set(std::memory_order_acquire);
+    CHECK(!was_locked);
   }
 
   void add_flags_from_poll(PollFlags flags) {