Delete //flutter/fml/compiler_specific.h (#54330)

chinmaygarde · web-flow · commit 04597dad970f · 2024-08-03T01:47:49.000Z
There were two macros for doing identical things and you can do the thing using standard C++17.
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -41749,7 +41749,6 @@ ORIGIN: ../../../flutter/fml/build_config.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/closure.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/command_line.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/command_line.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/fml/compiler_specific.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/concurrent_message_loop.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/concurrent_message_loop.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/concurrent_message_loop_factory.cc + ../../../flutter/LICENSE
@@ -44634,7 +44633,6 @@ FILE: ../../../flutter/fml/build_config.h
 FILE: ../../../flutter/fml/closure.h
 FILE: ../../../flutter/fml/command_line.cc
 FILE: ../../../flutter/fml/command_line.h
-FILE: ../../../flutter/fml/compiler_specific.h
 FILE: ../../../flutter/fml/concurrent_message_loop.cc
 FILE: ../../../flutter/fml/concurrent_message_loop.h
 FILE: ../../../flutter/fml/concurrent_message_loop_factory.cc
diff --git a/flow/layers/layer.h b/flow/layers/layer.h
@@ -19,7 +19,6 @@
 #include "flutter/flow/raster_cache.h"
 #include "flutter/flow/stopwatch.h"
 #include "flutter/fml/build_config.h"
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/trace_event.h"
diff --git a/fml/BUILD.gn b/fml/BUILD.gn
@@ -18,7 +18,6 @@ source_set("fml") {
     "base32.h",
     "build_config.h",
     "closure.h",
-    "compiler_specific.h",
     "concurrent_message_loop.cc",
     "concurrent_message_loop.h",
     "container.h",
diff --git a/fml/compiler_specific.h b/fml/compiler_specific.h
diff --git a/fml/platform/darwin/scoped_block.h b/fml/platform/darwin/scoped_block.h
@@ -7,7 +7,6 @@
 
 #include <Block.h>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/platform/darwin/scoped_typeref.h"
 
 #if defined(__has_feature) && __has_feature(objc_arc)
diff --git a/fml/platform/darwin/scoped_nsobject.h b/fml/platform/darwin/scoped_nsobject.h
@@ -13,7 +13,6 @@
 // singled out because it is most typically included from other header files.
 #import <Foundation/NSObject.h>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_typeref.h"
 
diff --git a/fml/platform/darwin/scoped_typeref.h b/fml/platform/darwin/scoped_typeref.h
@@ -5,7 +5,6 @@
 #ifndef FLUTTER_FML_PLATFORM_DARWIN_SCOPED_TYPEREF_H_
 #define FLUTTER_FML_PLATFORM_DARWIN_SCOPED_TYPEREF_H_
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/platform/darwin/scoped_policy.h"
 
 namespace fml {
diff --git a/fml/platform/darwin/weak_nsobject.h b/fml/platform/darwin/weak_nsobject.h
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 
 #include <utility>
-#include "flutter/fml/compiler_specific.h"
+
 #include "flutter/fml/logging.h"
 #include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/memory/ref_ptr.h"
diff --git a/fml/synchronization/semaphore.h b/fml/synchronization/semaphore.h
@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 
 namespace fml {
diff --git a/fml/unique_object.h b/fml/unique_object.h
@@ -7,7 +7,6 @@
 
 #include <utility>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
 
diff --git a/impeller/base/base_unittests.cc b/impeller/base/base_unittests.cc
@@ -59,8 +59,7 @@ TEST(ThreadTest, CanCreateRWMutex) {
   f.mtx.UnlockWriter();
   // int b = f.a; <--- Static analysis error.
   f.mtx.LockReader();
-  int b = f.a;  // NOLINT(clang-analyzer-deadcode.DeadStores)
-  FML_ALLOW_UNUSED_LOCAL(b);
+  [[maybe_unused]] int b = f.a;  // NOLINT(clang-analyzer-deadcode.DeadStores)
   f.mtx.UnlockReader();
 }
 
@@ -76,8 +75,7 @@ TEST(ThreadTest, CanCreateRWMutexLock) {
   // int b = f.a; <--- Static analysis error.
   {
     auto read_lock = ReaderLock(f.mtx);
-    int b = f.a;  // NOLINT(clang-analyzer-deadcode.DeadStores)
-    FML_ALLOW_UNUSED_LOCAL(b);
+    [[maybe_unused]] int b = f.a;  // NOLINT(clang-analyzer-deadcode.DeadStores)
   }
 
   // f.mtx.UnlockReader(); <--- Static analysis error.
diff --git a/runtime/dart_isolate.h b/runtime/dart_isolate.h
@@ -12,7 +12,6 @@
 #include <unordered_set>
 
 #include "flutter/common/task_runners.h"
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/lib/ui/io_manager.h"
diff --git a/runtime/dart_service_isolate.h b/runtime/dart_service_isolate.h
@@ -10,7 +10,6 @@
 #include <set>
 #include <string>
 
-#include "flutter/fml/compiler_specific.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
 namespace flutter {
diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "flutter/common/settings.h"
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/cpu_affinity.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/mapping.h"
@@ -71,12 +70,12 @@ static const char* kSerialGCArgs[] = {
     // clang-format on
 };
 
-FML_ALLOW_UNUSED_TYPE
+[[maybe_unused]]
 static const char* kDartWriteProtectCodeArgs[] = {
     "--no_write_protect_code",
 };
 
-FML_ALLOW_UNUSED_TYPE
+[[maybe_unused]]
 static const char* kDartDisableIntegerDivisionArgs[] = {
     "--no_use_integer_division",
 };
@@ -105,7 +104,7 @@ static std::string DartFileRecorderArgs(const std::string& path) {
   return oss.str();
 }
 
-FML_ALLOW_UNUSED_TYPE
+[[maybe_unused]]
 static const char* kDartDefaultTraceStreamsArgs[]{
     "--timeline_streams=Dart,Embedder,GC",
 };
diff --git a/runtime/service_protocol.h b/runtime/service_protocol.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <string_view>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/atomic_object.h"
 #include "flutter/fml/synchronization/shared_mutex.h"
diff --git a/vulkan/vulkan_backbuffer.cc b/vulkan/vulkan_backbuffer.cc
@@ -39,7 +39,7 @@ VulkanBackbuffer::VulkanBackbuffer(const VulkanProcTable& p_vk,
 }
 
 VulkanBackbuffer::~VulkanBackbuffer() {
-  FML_ALLOW_UNUSED_LOCAL(WaitFences());
+  [[maybe_unused]] auto result = WaitFences();
 }
 
 bool VulkanBackbuffer::IsValid() const {
diff --git a/vulkan/vulkan_backbuffer.h b/vulkan/vulkan_backbuffer.h
@@ -7,7 +7,6 @@
 
 #include <array>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/vulkan/procs/vulkan_handle.h"
 #include "third_party/skia/include/core/SkSize.h"
diff --git a/vulkan/vulkan_command_buffer.h b/vulkan/vulkan_command_buffer.h
@@ -5,7 +5,6 @@
 #ifndef FLUTTER_VULKAN_VULKAN_COMMAND_BUFFER_H_
 #define FLUTTER_VULKAN_VULKAN_COMMAND_BUFFER_H_
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/vulkan/procs/vulkan_handle.h"
 
diff --git a/vulkan/vulkan_debug_report.cc b/vulkan/vulkan_debug_report.cc
@@ -8,16 +8,17 @@
 #include <iomanip>
 #include <vector>
 
-#include "flutter/fml/compiler_specific.h"
 #include "vulkan_utilities.h"
 
 namespace vulkan {
 
-static const VkDebugReportFlagsEXT kVulkanErrorFlags FML_ALLOW_UNUSED_TYPE =
+[[maybe_unused]]
+static const VkDebugReportFlagsEXT kVulkanErrorFlags =
     VK_DEBUG_REPORT_WARNING_BIT_EXT |
     VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT | VK_DEBUG_REPORT_ERROR_BIT_EXT;
 
-static const VkDebugReportFlagsEXT kVulkanInfoFlags FML_ALLOW_UNUSED_TYPE =
+[[maybe_unused]]
+static const VkDebugReportFlagsEXT kVulkanInfoFlags =
     VK_DEBUG_REPORT_INFORMATION_BIT_EXT | VK_DEBUG_REPORT_DEBUG_BIT_EXT;
 
 std::string VulkanDebugReport::DebugExtensionName() {
diff --git a/vulkan/vulkan_device.cc b/vulkan/vulkan_device.cc
@@ -174,7 +174,7 @@ bool VulkanDevice::InitializeCommandPool() {
 }
 
 VulkanDevice::~VulkanDevice() {
-  FML_ALLOW_UNUSED_LOCAL(WaitIdle());
+  [[maybe_unused]] auto result = WaitIdle();
 }
 
 bool VulkanDevice::IsValid() const {
diff --git a/vulkan/vulkan_device.h b/vulkan/vulkan_device.h
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/vulkan/procs/vulkan_handle.h"
 
diff --git a/vulkan/vulkan_image.h b/vulkan/vulkan_image.h
@@ -5,7 +5,6 @@
 #ifndef FLUTTER_VULKAN_VULKAN_IMAGE_H_
 #define FLUTTER_VULKAN_VULKAN_IMAGE_H_
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/vulkan/procs/vulkan_handle.h"
 
diff --git a/vulkan/vulkan_swapchain.cc b/vulkan/vulkan_swapchain.cc
@@ -155,7 +155,7 @@ VulkanSwapchain::VulkanSwapchain(const VulkanProcTable& p_vk,
 
   swapchain_ = VulkanHandle<VkSwapchainKHR>{
       swapchain, [this](VkSwapchainKHR swapchain) {
-        FML_ALLOW_UNUSED_LOCAL(device_.WaitIdle());
+        [[maybe_unused]] auto result = device_.WaitIdle();
         vk.DestroySwapchainKHR(device_.GetHandle(), swapchain, nullptr);
       }};
 
diff --git a/vulkan/vulkan_swapchain.h b/vulkan/vulkan_swapchain.h
@@ -9,7 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/vulkan/procs/vulkan_handle.h"
 #include "third_party/skia/include/core/SkSize.h"
diff --git a/vulkan/vulkan_window.h b/vulkan/vulkan_window.h
@@ -10,7 +10,6 @@
 #include <utility>
 #include <vector>
 
-#include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/vulkan/procs/vulkan_proc_table.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
