Resolve conflicts with upstream master
#1563
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
…f:in:) to fix SR-10689. Cherry-pick from swiftlang/swift-corelibs-foundation#2499
This just returns isCompatibleWith(v.getOwnershipKind()). Just makes some code easier to write.
Put them in __objc_data instead of __objc_const. rdar://problem/66630432
…rameters. Specifically: 1. I made methods, variables camelCase. 2. I expanded out variable names (e.x.: bb -> block, predBB -> predBlocks, U -> wrappedUse). 3. I changed typedef -> using. 4. I changed a few c style for loops into for each loops using llvm::enumerate. NOTE: I left the parts needed for syncing to LLVM in the old style since LLVM needs these to exist for CRTP to work correctly for the SILSSAUpdater.
…ched via backward scan
…osure matches
Diagnose situations when trailing closure has been matched to a specific
parameter via a deprecated backward scan.
```swift
func multiple_trailing_with_defaults(
duration: Int,
animations: (() -> Void)? = nil,
completion: (() -> Void)? = nil) {}
multiple_trailing_with_defaults(duration: 42) {} // picks `completion:`
```
…constraint system
There is no guarantee that Mach ticks and nanoseconds have a 1:1 relationship. Use the `uptimeNanoseconds` field which will convert the raw value (which is in Mach ticks) to the time unit of nanoseconds. This was caught by the Dispatch stridable test in the Swift test suite. rdar://problem/56623421
Use the proper `swift_only_stable_abi` check to ensure that the tests do not run on targets that do not support the pre-stable ABI. Thanks to @slavapestov for pointing out that there was a better way!
…citLabel` diagnostic
…66693249 Temporarily disable failing test
…st-rdar66693249 Revert "Temporarily disable failing test"
…66644853 Temporarily disable failing test
test: use the `swift_only_stable_abi` feature instead of adhoc checks
…t-const IRGen: ObjC method lists are not const.
Dispatch: correct `DispatchTimeInterval` calculation on ASi
Just declaring a default in the standard library works fine.
ARM64 generates a `brk #0x1` for `unreachable` which generates a SIGTRAP. On x86, we would generate a `ud2` rather than `int 3` which are treated as `SIGILL` and `SIGTRAP` respectively.
Remove the target specific binary and instead compile a test binary on the fly. Because this test is restricted to macOS platforms, we know that we assume that we will have a compatible Objective-C runtime at our disposal. Use that to create a stub library for testing `NSClassFromString`. This allows this test to execute on ARM64.
The conversion of the naonseconds to Mach ticks in multiples of Mach timebase units alters the time. This would fail on ASi where mach ticks are not synonymous with nanoseconds.
SR-10689: Fix bugs of DataProtocol's firstRange(of:in:)/lastRange(of:in:).
…iftlang#33218) Pullback generation now supports `switch_enum` and `switch_enum_addr` instructions for `Optional`-typed operands. Currently, the logic is special-cased to `Optional`, but may be generalized in the future to support enums following general rules.
…e-needs-bool [SR-13262][Sema] Adding contextual type purpose for where clause expression in constraint system
[Tests] Codesign the binary before executing the test
…31921009e2ec94c12c22075 [sil] Define ValueOwnershipKind::isCompatibleWith(SILValue v).
…all-cases Sema: Don't need to derive CaseIterable's AllCases associated type
when we have an optional type. This uncovered an error with unresolved member lookup where we allowed an unresolved value member constraint to fail if lookup failed in an optional type wrapping a type variable. This resolves SR-13357.
test: repair stdlib/Dispatch on ASi
test: repair Interpreter/SDK/interpreter_with_options on ASi
test: repair Interpreter/bridged_casts_folding on ASi
…e02117c55a3d0f8989fa231 [ssa-updater] Modernize style before adding support for guaranteed parameters
several more places to use getOrCreateHelperFunction. This means that several of these places are now emitting shared functions rather than private ones, which I've verified is okay. There are some other places where privacy is still unfortunately necessary. I've also fixed the name of the store-extra-inhabitants helper function to say "store" instead of "get", which is longstanding (but harmless because it's private). Fixes rdar://66707994.
…lpers Add default IR attributes to helper functions
[Sema] Allow inference of binding to differing lvalue-ness type var…
The order of attribution was swapped which failed on platforms which use `comdat` (i.e. Windows).
…ing for a fixed type witness
test: repair Serialization.autolinking after swiftlang#33379
…ng#33203) Co-authored-by: Robert Widmann <devteam.codafi@gmail.com> Co-authored-by: Dmitri Gribenko <gribozavr@gmail.com>
AssociatedTypeInference: Stop skipping the current protocol when looking for a fixed type witness
…conflicts # Conflicts: # lib/IRGen/GenKeyPath.cpp # lib/IRGen/MetadataRequest.cpp
kateinoigakukun
approved these changes
Aug 11, 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.
Closes #1561