Skip to content

[lldb][FreeBSDKernelCore] Do not include <cstddef>#186193

Merged
mchoo7 merged 1 commit intollvm:mainfrom
mchoo7:cstddef
Mar 12, 2026
Merged

[lldb][FreeBSDKernelCore] Do not include <cstddef>#186193
mchoo7 merged 1 commit intollvm:mainfrom
mchoo7:cstddef

Conversation

@mchoo7
Copy link
Copy Markdown
Contributor

@mchoo7 mchoo7 commented Mar 12, 2026

<cstddef> was included for static assertion using offsetof(), but it turns out that the header is already included before. Thus remove <cstddef> includes from RegisterContextFreeBSDKernelCore_<arch>.cpp files.

Fixes 3f65a03 (#183969)

Signed-off-by: Minsoo Choo <minsoochoo0122@proton.me>
@llvmbot
Copy link
Copy Markdown
Member

llvmbot commented Mar 12, 2026

@llvm/pr-subscribers-backend-risc-v

@llvm/pr-subscribers-lldb

Author: Minsoo Choo (mchoo7)

Changes

&lt;cstddef&gt; was included for static assertion using offsetof(), but it turns out that the header is already included before. Thus remove &lt;cstddef&gt; includes from RegisterContextFreeBSDKernelCore_&lt;arch&gt;.cpp files.

Fixes 3f65a03 (#183969)


Full diff: https://github.com/llvm/llvm-project/pull/186193.diff

6 Files Affected:

  • (modified) lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm.cpp (-1)
  • (modified) lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp (-1)
  • (modified) lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp (-1)
  • (modified) lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_ppc64le.cpp (-1)
  • (modified) lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_riscv64.cpp (-1)
  • (modified) lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_x86_64.cpp (-1)
diff --git a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm.cpp b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm.cpp
index 8a2d7abfb277f..1477cf75e9f6f 100644
--- a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm.cpp
@@ -15,7 +15,6 @@
 #include "llvm/Support/Endian.h"
 
 #if defined(__FreeBSD__) && defined(__arm__)
-#include <cstddef>
 #include <machine/frame.h>
 #endif
 
diff --git a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp
index c4b3e2b0c25fc..80a5e0cf13a7c 100644
--- a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp
@@ -19,7 +19,6 @@
 #include "llvm/Support/Endian.h"
 
 #if defined(__FreeBSD__) && defined(__aarch64__)
-#include <cstddef>
 #include <machine/pcb.h>
 #include <sys/param.h>
 #endif
diff --git a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp
index c88f7f601b12a..0b44e52764d7c 100644
--- a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp
@@ -14,7 +14,6 @@
 #include "llvm/Support/Endian.h"
 
 #if defined(__FreeBSD__) && defined(__i386__)
-#include <cstddef>
 #include <machine/pcb.h>
 #endif
 
diff --git a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_ppc64le.cpp b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_ppc64le.cpp
index b8e5578b1b51e..3b0f269a3014d 100644
--- a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_ppc64le.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_ppc64le.cpp
@@ -14,7 +14,6 @@
 #include "llvm/Support/Endian.h"
 
 #if defined(__FreeBSD__) && defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)
-#include <cstddef>
 #include <machine/pcb.h>
 #endif
 
diff --git a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_riscv64.cpp b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_riscv64.cpp
index ea632968f9ebc..52a2f91742c76 100644
--- a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_riscv64.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_riscv64.cpp
@@ -14,7 +14,6 @@
 #include "llvm/Support/Endian.h"
 
 #if defined(__FreeBSD__) && defined(__riscv) && __riscv_xlen == 64
-#include <cstddef>
 #include <machine/pcb.h>
 #endif
 
diff --git a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_x86_64.cpp b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_x86_64.cpp
index 0034408b8f9ba..8f833aa47e486 100644
--- a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_x86_64.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_x86_64.cpp
@@ -14,7 +14,6 @@
 #include "llvm/Support/Endian.h"
 
 #if defined(__FreeBSD__) && defined(__amd64__)
-#include <cstddef>
 #include <machine/pcb.h>
 #endif
 

Copy link
Copy Markdown
Collaborator

@DavidSpickett DavidSpickett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it builds for you then it's fine with me, thanks for the quick follow up.

@mchoo7 mchoo7 merged commit e3f9aac into llvm:main Mar 12, 2026
13 checks passed
@mchoo7 mchoo7 deleted the cstddef branch March 12, 2026 18:16
@jrtc27
Copy link
Copy Markdown
Collaborator

jrtc27 commented Mar 12, 2026

Just because you can doesn’t mean you should. IWYU would say this header should still be included rather than implicitly relying on some other header already including it, no?

@mchoo7
Copy link
Copy Markdown
Contributor Author

mchoo7 commented Mar 12, 2026

Just because you can doesn’t mean you should. IWYU would say this header should still be included rather than implicitly relying on some other header already including it, no?

KGDB doesn't explicitly include <cstddef> (see here) so I thought it would be safe to do so. Would you like me to revert this PR? I'm fine with both.

@DavidSpickett
Copy link
Copy Markdown
Collaborator

I might be missing other advice that recommends IWYU, but this does not require it at least:
https://llvm.org/docs/CodingStandards.html#minimal-list-of-includes

I don't mind either way.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants