From ba3e7d7a8aea8a9eafebe3407d94b877cf16e362 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Tue, 2 Jul 2024 12:16:06 -0700
Subject: [PATCH] Revert workaround for std::mutex issues on github windows
 runners.

PiperOrigin-RevId: 648802955
---
 protos/protos_extension_lock_test.cc               | 4 ----
 src/google/protobuf/compiler/main.cc               | 3 ---
 src/google/protobuf/compiler/main_no_generators.cc | 3 ---
 3 files changed, 10 deletions(-)

diff --git a/protos/protos_extension_lock_test.cc b/protos/protos_extension_lock_test.cc
index cc02bc57d5521..9c2444b606fef 100644
--- a/protos/protos_extension_lock_test.cc
+++ b/protos/protos_extension_lock_test.cc
@@ -102,8 +102,6 @@ void TestConcurrentExtensionAccess(::protos::ExtensionRegistry registry) {
   test_theme();
   test_theme_extension();
 }
-#ifndef _MSC_VER
-// TODO Re-enable this once github runner issue is resolved.
 
 TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothLazy) {
   ::upb::Arena arena;
@@ -122,7 +120,5 @@ TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothEager) {
       {{&theme, &ThemeExtension::theme_extension}, arena});
 }
 
-#endif  // _MSC_VER
-
 }  // namespace
 }  // namespace protos_generator::test::protos
diff --git a/src/google/protobuf/compiler/main.cc b/src/google/protobuf/compiler/main.cc
index 7b2f5dca4b915..a5c7537f4ddce 100644
--- a/src/google/protobuf/compiler/main.cc
+++ b/src/google/protobuf/compiler/main.cc
@@ -35,10 +35,7 @@ namespace protobuf {
 namespace compiler {
 
 int ProtobufMain(int argc, char* argv[]) {
-#ifndef _MSC_VER
-  // TODO Re-enable this once github runner issue is resolved.
   absl::InitializeLog();
-#endif  // !_MSC_VER
 
   CommandLineInterface cli;
   cli.AllowPlugins("protoc-");
diff --git a/src/google/protobuf/compiler/main_no_generators.cc b/src/google/protobuf/compiler/main_no_generators.cc
index 82ba9238eee2a..83a44e8b4c5ed 100644
--- a/src/google/protobuf/compiler/main_no_generators.cc
+++ b/src/google/protobuf/compiler/main_no_generators.cc
@@ -19,10 +19,7 @@ namespace compiler {
 // This is a version of protoc that has no built-in code generators.
 // See go/protobuf-toolchain-protoc
 int ProtocMain(int argc, char* argv[]) {
-#ifndef _MSC_VER
-  // TODO Re-enable this once github runner issue is resolved.
   absl::InitializeLog();
-#endif  // !_MSC_VER
 
   CommandLineInterface cli;
   cli.AllowPlugins("protoc-");