Fix merge conflicts #62336
Merged
Fix merge conflicts #62336
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
Remove identical logic for OpenBSD, which doesn't include suffixes in `$CMAKE_SYSTEM_VERSION`.
Trying to run `update-checkout` with Git 1.8.3.1 fails during rebasing.
…which happens to be another Set
Previously, logging of the actually problematic instruction was guarded by LLVM_DEBUG. Meanwhile the verifier's require method prints an instruction (usually one different from that at which the non-contiguous scope was encountered). Here, instead, the problematic instruction and the instruction which defined the previous scope are printed to llvm::errs always (i.e. whenever verification is actually run). Additionally, debug-info logging is forcibly set on upon failure so that the logs clearly show both what the previous scope was, what the current scope is, and what instructions defined them.
Clarified preconditions, removed spurious explicit typing, and suprious control flow.
Resolves partially swiftlang#49997.
…ess() per Microsoft documentation
…dging invocation This fixes some CI failures
…ked more than once. We cannot filter all libraries because duplicate -l flags have a semantic meaning based on their order, but filtering out just the common Swift libraries should yield a good size improvement already and is safe.
Per Swift Evolution feedback, back deployed functions should be allowed to be inlinable, even though this means that the version of the function in the library may not always be exectued when it is otherwise available. Resolves rdar://102792806
* Introduce TypeLayout Strings Layout strings encode the structure of a type into a byte string that can be interpreted by a runtime function to achieve a destroy or copy. Rather than generating ir for a destroy/assignWithCopy/etc, we instead generate a layout string which encodes enough information for a called runtime function to perform the operation for us. Value witness functions tend to be quite large, so this allows us to replace them with a single call instead. This gives us the option of making a codesize/runtime cost trade off. * Added Attribute @_GenerateLayoutBytecode This marks a type definition that should use generic bytecode based value witnesses rather than generating the standard suite of value witness functions. This should reduce the codesize of the binary for a runtime interpretation of the bytecode cost. * Statically link in implementation Summary: This creates a library to store the runtime functions in to deploy to runtimes that do not implement bytecode layouts. Right now, that is everything. Once these are added to the runtime itself, it can be used to deploy to old runtimes. * Implement Destroy at Runtime Using LayoutStrings If GenerateLayoutBytecode is enabled, Create a layout string and use it to call swift_generic_destroy * Add Resilient type and Archetype Support for BytecodeLayouts Add Resilient type and Archetype Support to Bytecode Layouts * Implement Bytecode assign/init with copy/take Implements swift_generic_initialize and swift_generic_assign to allow copying types using bytecode based witnesses. * Add EnumTag Support * Add IRGen Bytecode Layouts Test Added a test to ensure layouts are correct and getting generated * Implement BytecodeLayouts ObjC retain/release * Fix for Non static alignments in aligned groups * Disable MultiEnums MultiEnums currently have some correctness issues with non fixed multienum types. Disabling them for now then going to attempt a correct implementation in a follow up patch * Fixes after merge * More fixes * Possible fix for native unowned * Use TypeInfoeBasedTypeLayoutEntry for all scalars when ForceStructTypeLayouts is disabled * Remove @_GenerateBytecodeLayout attribute * Fix typelayout_based_value_witness.swift Co-authored-by: Gwen Mittertreiner <[email protected]> Co-authored-by: Gwen Mittertreiner <[email protected]>
[interop][SwiftToCxx] use the more appropriate String -> NSString bri…
…ead/unsafeAddress properties. Addresses part of rdar://102525437.
…ftinterfaces. rdar://72873771
rdar://72873771
These tests identified a gap in type checking the exportability of case statements. Unfortunately this gap is not simple to close, since exportability is usually checked during availability checking but availability checking isn't appropriate for case statements and there isn't existing infrastructure to check exportability independently.
This utility helps codify the practice of using the attributes of the first element of a case decl as the attributes for the entire case.
[SILDebugInfo] Small tweaks.
…deployed-functions Sema: Allow `@inlinable` on back deployed functions
SIL: Add parser support for `has_symbol` instructions
…ion-suffix
build: add missing `REGEX` to properly strip {Free,Open}BSD version suffixes
docs: convert `ErrorHandling` from `.rst` to `.md`
…er-debugging-indentation Improve indentation in type checker debugging output
[Runtime] Add missing bridgeObjectRR_xN entrypoints.
…tolinkCommands [Autolink Extract] Filter out StringProcessing library from being linked more than once.
…base class. Resolves rdar://101915368
…with-setter-reabstraction SILGen: Match up abstraction level when materializing mixed set and read/unsafeAddress properties.
…platforms. An early approach to codegen for `#_hasSymbol` relied on the Darwin platfom SDK, but now that the feature lowers directly to NULL checks in LLVM IR a platform restriction is no longer needed. However, the tests for `#_hasSymbol` remain unsupported on Windows since that OS does not support weak linking.
Attr can be null here if it was a custom attribute from an implementation-only dependency. rdar://102525437
[stdlib] Do not allocate when creating a Set from a generic Sequence which happens to be another Set
…x-availability-exception Sema: Allow `AnyColorBox` in SwiftUI to derive from a less available base class
ModuleInterface: Avoid printing `@_spi` enum elements in public swiftinterfaces
…ss-handle Refactor `_swift_withWin32DbgHelpLibrary()` to avoid using `GetCurrentProcess()` per Microsoft documentation
…linux Sema: Lift restriction preventing use of `#_hasSymbol` on non-Darwin-platforms
eeckstein
requested review from
CodaFi,
DougGregor,
ahoppen,
bnbarham,
egorzhdan,
hyp,
rintaro and
zoecarver
as code owners
Contributor
Author
|
@swift-ci test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
22 participants
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.