Merge tensorflow-merge into tensorflow #27751
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
discovering the beginning of the string interpolation passed to os log APIs. The implementation follows the chain of dependencies starting from an initializer call to OSLogMessage until the first instruction of interpolation is discovered. This is more robust towards changes to the SIL generation of string interpolation literals.
This allows us to define a `LocatorPathElt` subclass for each path element kind.
This makes it consistent with `getLastElementAs` and `castLastElementTo`.
Rename to LocatorPathElt::ProtocolRequirement in order to help avoid confusion with LocatorPathElt::AnyRequirement.
…e type yet Fixes rdar://55560962 and https://bugs.swift.org/browse/SR-11495 This bug was caused because we'd fail to lookup C in B, because we hadn't computed its type yet and therefore B is filtered from lookup. Just remove the filter for interface type.
Recently introduced tests have some of their path separators output with Windows separators. Adapt the test to account for the different output in Windows.
[NFC] Add a regression test for SR-5252
Structurally prevent a number of common anti-patterns involving generic signatures by separating the interface into GenericSignature and the implementation into GenericSignatureBase. In particular, this allows the comparison operators to be deleted which forces callers to canonicalize the signature or ask to compare pointers explicitly.
[CS] Define a class for every locator path element kind
[NFC] Adopt TypeBase-isms for GenericSignature
…nches for testing purposes I am going to use this in a subsequent commit to make sure we do not infinite loop upon a test case. rdar://55861081
… prevent infinite loops. Previously, we were not handling properly blocks that we could visit multiple times. In this commit, I added a SmallPtrSet to ensure that we handle all of the same cases that we handled previously. The key reason that we want to follow this approach rather than something else is that the previous algorithm on purpose allowed for side-entrances from other checks since often times when we have multiple checks, all of the .none branches funnel together into a single ultimate block. This can be seen by the need of this code to support the test two_chained_calls in simplify_switch_enum_objc.sil. rdar://55861081
[windows][test] Use regexes for some (more) path separators.
…#27412) Two places in Driver are creating temporary files at a point in the process where failure is not expected. We should do something better about this, but meanwhile harmonize their failures and include a little more info. Filed https://bugs.swift.org/browse/SR-11541 to improve this.
Identifier contains a pointer to character data, and we need to ensure that this pointer has enough spare bits in it for DeclBaseName and DeclName. This currently happens to be true because the StringMap used to intern Identifier pointers happens to place a 32-bit size field in the MapTableEntry object, but it would be better to explicitly force the alignment we want and assert that it’s correct.
…ing-superclass [Deserialization] Allow lookup into decls that don't have an interface type yet
…block Disabled checking in blocks which end up in an unreachable-instruction. Inconsistent states are allowed in such blocks. https://bugs.swift.org/browse/SR-11545 rdar://problem/55842518
Define `DifferentiableActivityInfo::getLookupConformanceFunction` helper. Use `LookUpConformanceInModule` when derivative generic signature is undefined.
Finish merge from swift-DEVELOPMENT-SNAPSHOT-2019-10-08-a
Swig bindings have changed.
Update lldb dependency
Merge branch 'tensorflow' into tensorflow-merge
|
Had a few minor conflicts following today's cleanups in the tensorflow branch. |
|
@swift-ci please clean test tensorflow |
dan-zheng
approved these changes
Oct 17, 2019
There was a problem hiding this comment.
I checked only utils/update_checkout/update-checkout-config.json, which looks correct.
|
No point in merging this, 4ebb910 introduces new merge conflicts. |
Sorry about that! I don't plan to create any more PRs today. |
|
Fixed. There weren't any physical merge conflicts, just broken build because of |
|
@swift-ci please clean test tensorflow |
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.