[5.5] Windows Profiling Improvements #37610
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Windows linker does not support `-u`. Furthermore, the compiler driver does not forward the `-u` option to the linker. We correctly use the `/include:` option from the linker. This should ensure that the symbol is preserved even with `/opt:ref`. This spelling should be compatible with both lld and link, which should provide sufficient portability. Take the opportunity to make it more obvious that the two parameters are creating a pair that will be concatenated by using a braced initializer. See https://docs.microsoft.com/en-us/cpp/build/reference/include-force-symbol-references?view=msvc-160 for more details on the option. (cherry picked from commit b3d5181)
Rather than computing an absolute path relative to Swift's resource directory, use the compiler driver to locate the profiling runtime relative to the C/C++ compiler's resource directory. This ensures that we correctly locate the runtime. Additionally, because clang adds the clang resource directory to the library search path, we do not need to compute the path and can rely on the linker locating the runtime via the library search path. This simplifies the handling for the profile runtime linking on Windows. Out of abundant paranoia, place the library link request after the forced symbol inclusion as a GC root to ensure that `/opt:ref` will not accidentally dead strip the symbol and force a reload of the library. (cherry picked from commit fc3ccdc)
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test macOS platform |
compnerd
changed the title
artemcm
approved these changes
May 26, 2021
tkremenek
approved these changes
May 27, 2021
AnthonyLatsis
added
🍒 release cherry pick
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a super low risk change for 5.5 to improve the clang (linker) driver invocation and linker options for enabling profiling support on Windows. This only impacts the Windows toolchain, and under
-profile-generateonly.