Upstream merge 5.3 #1724
Merged
Upstream merge 5.3 #1724
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
This reverts commit 499ed05. This changes the num-threads passed to 1 to avoid a multithreaded output issue on windows
Previously the path to covered files in the __LLVM_COV / __llvm_covmap section were absolute. This made remote builds with coverage information difficult because all machines would have to have the same build root. This change uses the values for `-coverage-prefix-map` to remap files in the coverage info to relative paths. These paths work correctly with llvm-cov when it is run from the same source directory as the compilation, or from a different directory using the `-path-equivalence` argument. This is analogous to this change in clang https://reviews.llvm.org/D81122
- deduplicate the logic to compute the resource folder - install headers and module files in shared and static resource folders - forward -static flag when calling swiftc with -print-target-info
rdar://66693249
(cherry picked from commit bfef9d4)
(cherry picked from commit c123f42)
(cherry picked from commit d52a159)
(cherry picked from commit e54127b)
There's a more robust check for which SDK to support already. This also misses `arm64` as architecture. (cherry picked from commit ca3d37f)
…incredible-shaggy-dog-story [release/5.3] Re-enable @available(macOS 11) test
…nking-5.3 [5.3] Properly compute resource folder when linking statically
…s to Any This caused a problem when propagating the concrete type of an existential: if the concrete type is itself an opened existential, it was not added to the OpenedArchetypeTracker. https://bugs.swift.org/browse/SR-13444 rdar://problem/68077098
…ompat-suite [5.3] [Preset] Source compat suite cross compile for macOS arm64
…nt generation failures Ignore function builder body if it emits at least one diagnostic during constraint generation. Resolves: rdar://problem/65983237
[5.3] SILCombine: fix an assertion crash in SILCombine when casting AnyClass to Any
[5.3][ConstraintSystem] Extend invalid function body fix to cover constrai…
(cherry picked from commit 109b7b8)
…lldb-test-package [5.3] Disable LLDB tests in nightly package preset (67923799)
|
Is this much different from #1713? 🤔 |
…point. This can happen when a non-substitutable opaque type appears in structural position, such as the root of an associated type archetype. Fixes rdar://problem/67040429.
…-terminate-on-fix-point-5.3 [5.3] Stop ReplaceOpaqueTypesWithUnderlyingTypes recursion if it hits a fixpoint
Bug fix: Emit code for C++ inline function called from another inline function
…ang-decl [IRGen] Check as early as possible for Clang decls we've seen before.
Explanation: LLVM currently asserts on local extern variables in C headers passed to Swift when the definition exists outside that header. Scope: This never worked. Risk: Low. Testing: Regression test added. Reviewed-by: John McCall Original PR: swiftlang#33306 This fix also required the cherry-pick of: swiftlang#31035 and swiftlang#31272 rdar://67951491
…ang#33780) * Support cross compile Xcode toolchain for Apple Silicon * Add CMake flag DCMAKE_OSX_ARCHITECTURES to LLVM * Add CMake flag DCMAKE_OSX_ARCHITECTURES to cmark * Add CMake flag DCMAKE_OSX_ARCHITECTURES to lldb * Add CMake flag DCMAKE_OSX_ARCHITECTURES to llbuild * Add llbuild CMake options array to provide DCMAKE_OSX_ARCHITECTURES * [Build System] Use one install package for cross compile hosts * Remove Lipo before non-build-script-impl products * Add support to only lipo without running installable package tests * [Build System] Support cross compile install prefix for SwiftPM product in Swift Build Support * Use cross compile toolchain path for indexstoredb and swift-driver * Use cross compile toolchain path for swiftpm, swiftsyntax, swiftformat, and skstresstester * Add cross compile toolchain support to Benchmarks, and fix the python lint issue in skstresstester.py * [SwiftPM] Add support for cross-compile-hosts flag to build swiftpm using bootstrap script (cherry picked from commit bf7c03b) * Remove DCMAKE_OSX_SYSROOT from LLDB CMake flag The cherry-picked added DCMAKE_OSX_SYSROOT flag when it should not have. * Don't build SwiftUnitTests for cross compile host (cherry picked from commit ceeb724) * Don't run LLDB cross compile host test suite (cherry picked from commit bb356d3) * Remove compiler-rt from install targets for cross compile host (cherry picked from commit 9adbace) * [Package] When building a toolchain, don't copy the Resource directory. Should dramatically improve the size of the snapshost produced, as we don't have stdlib et similia included twice. Also, it helps when producing fat binaries, as we don't have to implement any mechanism for sandwiching all the slices together. (cherry picked from commit 8337f96) * Add missing imports for swiftpm in the products class Co-authored-by: Davide Italiano <[email protected]>
kateinoigakukun
force-pushed
the
katei-merge-5.3
branch
from
19737ae to
0535399
Compare
|
This pr attempt to fix build failure without any revert. |
|
Cool, bear in mind I also applied a revert on our fork of Foundation to always use |
…ting_local_extern_5.3 [5.3] IRGen: Fix asserting local extern declarations.
…p-5.3 [5.3] Fix glibc.modulemap generation
5.3: Emit coverage mappings for all modules
Add path remapping with -coverage-prefix-map to coverage data
|
CI passed 🎉 |
MaxDesiatov
approved these changes
Sep 13, 2020
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.
No description provided.