Skip to content

[Modules] Mark CFProtectionOptions.def as a textual header because it is used for x-macro purposes. #110780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2024

Conversation

vsapsai
Copy link
Collaborator

@vsapsai vsapsai commented Oct 2, 2024

No description provided.

@llvmbot llvmbot added the clang Clang issues not falling into any other category label Oct 2, 2024
@llvmbot
Copy link
Member

llvmbot commented Oct 2, 2024

@llvm/pr-subscribers-clang

Author: Volodymyr Sapsai (vsapsai)

Changes

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

1 Files Affected:

  • (modified) clang/include/module.modulemap (+1)
diff --git a/clang/include/module.modulemap b/clang/include/module.modulemap
index b6ab99bb85d8a7..6f18c0a49641c9 100644
--- a/clang/include/module.modulemap
+++ b/clang/include/module.modulemap
@@ -65,6 +65,7 @@ module Clang_Basic {
   textual header "clang/Basic/BuiltinsX86.def"
   textual header "clang/Basic/BuiltinsX86_64.def"
   textual header "clang/Basic/BuiltinsXCore.def"
+  textual header "clang/Basic/CFProtectionOptions.def"
   textual header "clang/Basic/CodeGenOptions.def"
   textual header "clang/Basic/DebugOptions.def"
   textual header "clang/Basic/DiagnosticOptions.def"

@vsapsai
Copy link
Collaborator Author

vsapsai commented Oct 2, 2024

CI error

Traceback (most recent call last):
  File "/var/lib/buildkite-agent/builds/linux-56-59b8f5d88-r8xzr-1/llvm-project/github-pull-requests/libcxx/utils/generate_iwyu_mapping.py", line 92, in <module>
    main(sys.argv[1:])
  File "/var/lib/buildkite-agent/builds/linux-56-59b8f5d88-r8xzr-1/llvm-project/github-pull-requests/libcxx/utils/generate_iwyu_mapping.py", line 82, in main
    raise RuntimeError(f"{header}: Header {public} is not a valid header")
RuntimeError: __cxx03/__algorithm/adjacent_find.h: Header cxx03 is not a valid header

is unrelated to the current change.

@vsapsai vsapsai merged commit 1202c24 into llvm:main Oct 2, 2024
8 of 10 checks passed
@vsapsai vsapsai deleted the fix-xmacro-header-in-modulemap branch October 2, 2024 04:48
Sterling-Augustine pushed a commit to Sterling-Augustine/llvm-project that referenced this pull request Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants