install a list of symbols generated by the PrintAsClang header #59072
Conversation
|
@gottesmm Is it possible to reference this file from a lit test? I would love to be able to verify that the generated compatibility header actually matches the list of symbols in the installed file, but i'm not sure the best way to approach it. |
|
@swift-ci Please smoke test |
|
@swift-ci Please build toolchain macOS |
QuietMisdreavus
force-pushed
the
QuietMisdreavus/compat-syms
branch
from
57f9c17 to
f2c6a9b
Compare
|
@gottesmm I've overhauled the PR to generate the PrintAsClang macros via a definition file. I then took this file and used it in a new host tool to dynamically generate the list of compatibility symbols instead of making it a static file. Can you take another look? |
|
@swift-ci Please test |
QuietMisdreavus
force-pushed
the
QuietMisdreavus/compat-syms
branch
from
bf0da08 to
e17c615
Compare
|
Rebased to handle merge conflict. @swift-ci Please test |
| @@ -0,0 +1,38 @@ | |||
| IBSegueAction | |||
There was a problem hiding this comment.
Nit: These are not symbols in the usual sense, since they aren’t linkable. “Identifier”? “Macro?”
There was a problem hiding this comment.
They're "symbols" in the sense that they would be emitted in a symbol graph and appear in documentation, though. "Symbols for documentation" has a looser definition than "symbols for linking".
QuietMisdreavus
force-pushed
the
QuietMisdreavus/compat-syms
branch
from
e17c615 to
915ade4
Compare
|
Rebased to handle merge conflict. @swift-ci Please test |
QuietMisdreavus
force-pushed
the
QuietMisdreavus/compat-syms
branch
from
915ade4 to
0ea00fd
Compare
|
@swift-ci Please test |
| #define CLANG_MACRO_CXX_BODY(NAME, BODY) \ | ||
| CLANG_MACRO_DEFINED(NAME) | ||
|
|
||
| #include "swift/PrintAsClang/ClangMacros.def" |
There was a problem hiding this comment.
We also need to handle mapped SIMD types, maybe something along the lines of:
#define MAP_SIMD_TYPE(C_TYPE, SCALAR_TYPE, _) \
CLANG_MACRO_DEFINED("swift_" #C_TYPE "2") \
CLANG_MACRO_DEFINED("swift_" #C_TYPE "3") \
CLANG_MACRO_DEFINED("swift_" #C_TYPE "4")
QuietMisdreavus
force-pushed
the
QuietMisdreavus/compat-syms
branch
from
0ea00fd to
b35c01f
Compare
|
Rebased to the latest main, squashed the commits, and added a new one that addresses @daniel-grumberg's comment. @swift-ci Please test |
|
@swift-ci Please build toolchain |
|
@swift-ci Please test |
|
|
||
| CLANG_MACRO_DEFINED("SWIFT_TYPEDEFS") | ||
|
|
||
| #define MAP_SIMD_TYPE(C_TYPE, SCALAR_TYPE, _) \ |
There was a problem hiding this comment.
These aren't macros but rather typedefs. Would it make more sense for this logic to go into the actual executable.
There was a problem hiding this comment.
I feel like the purpose of this file is mainly to accumulate the symbols that PrintAsClang adds to the compatibility header, whether they're macros or not. The infrastructure treats them all as macros, but the end result is the same: We can use the resulting list in clang-extractapi to filter out the symbols that didn't actually come from user code.
swiftlang#59072 accidentally changed the SWIFT_CLASS_NAMED macro to use `__attribute` when it previously used `__attribute__` (note the trailing underscores). While both keywords have the same semantics in clang, they are technically different tokens, so clang refuses to merge macro definitions that use one instead of the other; instead it would diagnose an ambiguity when a generated header from a new compiler imported a generated header from an old compiler. Change back to the old token to avoid this problem. Fixes rdar://104252758.
#59072 accidentally changed the SWIFT_CLASS_NAMED macro to use `__attribute` when it previously used `__attribute__` (note the trailing underscores). While both keywords have the same semantics in clang, they are technically different tokens, so clang refuses to merge macro definitions that use one instead of the other; instead it would diagnose an ambiguity when a generated header from a new compiler imported a generated header from an old compiler. Change back to the old token to avoid this problem. Fixes rdar://104252758.
Resolves rdar://93504690
This PR adds a new file that is installed with the compiler:
compatibility_symbols. This is a list of the macros defined in the compatibility header generated by PrintAsClang when exposing Swift symbols to Objective-C. The idea behind creating this file was that tools that parsed C-based headers for symbols (e.g. the newclang-extractapi) could use this file to filter out symbols that were not part of the user's own code.