Fix IWYU inclusion of <atomic> when TRACE_EVENT is used.

The TRACE_EVENT macros use std::atomic, but TraceEvent.h already includes <atomic> alongside the macros themselves. IWYU just can't see through the preprocessor. Change-Id: I6060dad2e25f3a7e30c63c2e6c4488545dcf9f96 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/793318 Auto-Submit: John Stiles <[email protected]> Commit-Queue: John Stiles <[email protected]> Reviewed-by: Brian Osman <[email protected]>
google · Dec 21, 2023 · a9db121 · a9db121
1 parent 4b16117
commit a9db121
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 8 deletions.
diff --git a/gm/gm.cpp b/gm/gm.cpp
@@ -26,7 +26,6 @@
 #include "include/gpu/GrRecordingContext.h"
 #endif
 
-#include <atomic>
 #include <cstdarg>
 #include <cstdint>
 

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
@@ -60,7 +60,6 @@
 #include "src/utils/SkPatchUtils.h"
 
 #include <algorithm>
-#include <atomic>
 #include <memory>
 #include <new>
 #include <optional>

diff --git a/src/gpu/ganesh/Device.cpp b/src/gpu/ganesh/Device.cpp
@@ -102,7 +102,6 @@
 #include "src/text/gpu/SlugImpl.h"
 #include "src/text/gpu/SubRunContainer.h"
 
-#include <atomic>
 #include <cstddef>
 #include <cstdint>
 #include <functional>

diff --git a/src/gpu/ganesh/GrBlurUtils.cpp b/src/gpu/ganesh/GrBlurUtils.cpp
@@ -91,7 +91,6 @@
 
 #include <algorithm>
 #include <array>
-#include <atomic>
 #include <cmath>
 #include <cstdint>
 #include <cstring>

diff --git a/src/gpu/ganesh/gl/GrGLGpu.cpp b/src/gpu/ganesh/gl/GrGLGpu.cpp
@@ -69,7 +69,6 @@
 #include "src/sksl/ir/SkSLProgram.h"
 
 #include <algorithm>
-#include <atomic>
 #include <cmath>
 #include <functional>
 #include <memory>

diff --git a/src/gpu/graphite/vk/VulkanGraphiteUtils.cpp b/src/gpu/graphite/vk/VulkanGraphiteUtils.cpp
@@ -16,6 +16,7 @@
 #include "src/gpu/graphite/vk/VulkanQueueManager.h"
 #include "src/gpu/graphite/vk/VulkanSharedContext.h"
 #include "src/sksl/SkSLProgramSettings.h"
+
 namespace skgpu::graphite::ContextFactory {
 
 std::unique_ptr<Context> MakeVulkan(const VulkanBackendContext& backendContext,

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
@@ -26,7 +26,6 @@
 #include "src/sksl/ir/SkSLSymbolTable.h"  // IWYU pragma: keep
 #include "src/sksl/transform/SkSLTransform.h"
 
-#include <atomic>
 #include <cstdint>
 #include <memory>
 #include <utility>

diff --git a/src/text/gpu/SkChromeRemoteGlyphCache.cpp b/src/text/gpu/SkChromeRemoteGlyphCache.cpp
@@ -47,7 +47,6 @@
 #include "src/text/gpu/SubRunContainer.h"
 #include "src/text/gpu/TextBlob.h"
 
-#include <atomic>
 #include <cstring>
 #include <memory>
 #include <optional>

diff --git a/tests/TracingTest.cpp b/tests/TracingTest.cpp
@@ -14,7 +14,6 @@
 #include "tests/Test.h"
 #include "tools/flags/CommandLineFlags.h"
 
-#include <atomic>
 #include <cstdint>
 
 static DEFINE_bool(slowTracingTest, false,

diff --git a/toolchain/linux_trampolines/IWYU_mapping.imp b/toolchain/linux_trampolines/IWYU_mapping.imp
@@ -448,6 +448,11 @@
 
   { symbol: ["SkScalar", "private", "\"include/core/SkScalar.h\"", "public"] },
 
+  # The TRACE_EVENT macros use std::atomic, but TraceEvent.h already includes <atomic> alongside
+  # the macros themselves; IWYU just can't see through the preprocessor.
+  { symbol: ["std::atomic", "private", "<atomic>", "public"] },
+  { symbol: ["std::atomic", "private", "\"src/core/SkTraceEvent.h\"", "public"] },
+
   # IWYU seems to get confused on where the namespace sktext is "defined". Any files in
   # this list are ok.
   { symbol: ["sktext", "private", "\"src/text/StrikeForGPU.h\"", "public"] },