Author: Ian Anderson Date: 2024-04-12T22:36:43-07:00 New Revision: 4138367444a2e3431cdfc7ab6e16c9cab5c76ad8
URL: https://github.com/llvm/llvm-project/commit/4138367444a2e3431cdfc7ab6e16c9cab5c76ad8 DIFF: https://github.com/llvm/llvm-project/commit/4138367444a2e3431cdfc7ab6e16c9cab5c76ad8.diff LOG: [modules] allow use of ptrauth module from no_undeclared_includes system modules (#88432) Co-authored-by: Alex Lorenz <arpha...@gmail.com> Added: clang/test/Modules/Inputs/ptrauth-include-from-darwin/module.modulemap clang/test/Modules/Inputs/ptrauth-include-from-darwin/ptrauth.h clang/test/Modules/Inputs/ptrauth-include-from-darwin/stddef.h clang/test/Modules/ptrauth-include-from-darwin.m Modified: clang/lib/Basic/Module.cpp Removed: ################################################################################ diff --git a/clang/lib/Basic/Module.cpp b/clang/lib/Basic/Module.cpp index 256365d66bb907..bb212cde878826 100644 --- a/clang/lib/Basic/Module.cpp +++ b/clang/lib/Basic/Module.cpp @@ -305,6 +305,10 @@ bool Module::directlyUses(const Module *Requested) { if (Requested->fullModuleNameIs({"_Builtin_stddef", "max_align_t"}) || Requested->fullModuleNameIs({"_Builtin_stddef_wint_t"})) return true; + // Darwin is allowed is to use our builtin 'ptrauth.h' and its accompanying + // module. + if (!Requested->Parent && Requested->Name == "ptrauth") + return true; if (NoUndeclaredIncludes) UndeclaredUses.insert(Requested); diff --git a/clang/test/Modules/Inputs/ptrauth-include-from-darwin/module.modulemap b/clang/test/Modules/Inputs/ptrauth-include-from-darwin/module.modulemap new file mode 100644 index 00000000000000..741b9bb1efc54d --- /dev/null +++ b/clang/test/Modules/Inputs/ptrauth-include-from-darwin/module.modulemap @@ -0,0 +1,8 @@ +module libc [no_undeclared_includes] { + module stddef { header "stddef.h" export * } +} + +module ptrauth { + header "ptrauth.h" + export * +} diff --git a/clang/test/Modules/Inputs/ptrauth-include-from-darwin/ptrauth.h b/clang/test/Modules/Inputs/ptrauth-include-from-darwin/ptrauth.h new file mode 100644 index 00000000000000..c8620b64b2ceef --- /dev/null +++ b/clang/test/Modules/Inputs/ptrauth-include-from-darwin/ptrauth.h @@ -0,0 +1 @@ +void foo(); diff --git a/clang/test/Modules/Inputs/ptrauth-include-from-darwin/stddef.h b/clang/test/Modules/Inputs/ptrauth-include-from-darwin/stddef.h new file mode 100644 index 00000000000000..777a524fc67110 --- /dev/null +++ b/clang/test/Modules/Inputs/ptrauth-include-from-darwin/stddef.h @@ -0,0 +1 @@ +@import ptrauth; diff --git a/clang/test/Modules/ptrauth-include-from-darwin.m b/clang/test/Modules/ptrauth-include-from-darwin.m new file mode 100644 index 00000000000000..72b0c36e7cb7d3 --- /dev/null +++ b/clang/test/Modules/ptrauth-include-from-darwin.m @@ -0,0 +1,6 @@ +// RUN: rm -rf %t +// RUN: %clang_cc1 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs/ptrauth-include-from-darwin %s -verify +// expected-no-diagnostics + +@import libc; +void bar() { foo(); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits