Merge 2020-09-14 into tensorflow #33959
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
A bunch of callers were accidentally misusing it.
Refactor TypeCheckFunctionBodyRequest to return the type-checked body, and remove `typeCheckAbstractFunctionBody` in favor of a method on AbstractFunctionDecl. In addition, start returning an ErrorExpr body instead of a partially type-checked body if type-checking fails.
We no longer run error checking for already type-checked synthesized functions, so add a couple of `setThrows` calls where they were previously missing.
Use `getTypecheckedBody` to allow lazy type-checking when emitting function definitions.
…version is invalid If the right-hand side (destination) of value-to-pointer conversion is incorrect e.g. base type of member is a hole, let's record a generic "invalid conversion" failure. Resolves: rdar://problem/68254165
Fix the parsing of await/try/try?/try! so that the two can be nested (e.g., `await try f()` or `try await f()`). Then, fix the effects checking logic to preserve all throws-related information under an `await`, and preserve all async/await-related information under `try`/`try?`/`try!`. Add a number of tests, and fix 'await' handling for string interpolations as well.
utils: add a timeout to the integration tests
ModuleInterface: remark potential version differences between SDK and prebuilt modules
[Concurrency] Fix nested await/try parsing and effects checking.
[benchmark] Add new benchmark for floating-point conversion
…rebranch Delete build-windows-rebranch.bat
…ndLayout handler. NFC.
…kup-flag Remove -enable-astscope-lookup flag
…on-inlined locs. The reason why is that due to ARCCodeMotion, they could have moved enough that the SourceLoc on them is incorrect. That is why you can see in the tests that I had to update, I am moving the retain to the return statement from the body of the function since the retain was now right before the return. I also went in and cleaned up the logic here a little bit. What we do now is that we have a notion of instructions that we /always/ infer SourceLocs for (rr) and ones that if we have a valid non-inlined location we use (e.x.: allocations). This mucked a little bit with my ability to run SIL tests since the SIL tests were relying on this not happening to rr so that we would emit remarks on the rr instructions themselves. I added an option that disables the always infer behavior for this test. That being said at this point to me it seems like the SourceLoc inference stuff is really tied to OptRemarkGenerator and I am going to see if I can move it to there. But that is for a future commit on another day.
Windows IR seems to include a `dso_local` annotation, which the check didn't expect and caused a failure in #33813. Added a regex check to ensure the test passes with or without the annotation.
[ConstraintSystem] Record generic fix if destination of a pointer con…
…d3539e96b7d29d
The WinSDK module failed to expose WinBase properly for reuse, which the newer clang seems to object to (via an assertion). Add a separate module for WinBase which allows reuse of the definitions without causing conflicts. This caused some additional fallout requiring the creation of the WinSVC submodule (service handling, part of security and identity) and splitting up the legacy WinSock header from the WinSock2 module. This allows building Foundation again on Windows.
If the supplied method is not static, offer a fix-it to make it static
This is a misnomer from when SILInstructions were always single valued. NFC.
…1d0874cd466764 [opt-remark] Infer the source loc retain, release even if they have non-inlined locs.
[test][IRGen] Fix check on local_extern test.
[shims] Add AppKit overlay shims
SILParser: Fix for removal of parse-time name lookup
[NFC] Refactor InputFile
[sil-opt] Fix covering all-case of trapping instruction of SILInstruction::mayTrap
This flag is a GNU extension, and would cause misleading test failures on other platforms where this extension is not available. However, the necessity to switch line endings is only required on Windows when testing. We could use sed to canonicalize line endings before comparing, but that may cause higher amounts of filesystem traffic on Windows which would slow down testing. Instead, move the substitution for diff in SourceKit's lit.local.cfg up to the top level, and conditionalize the substitution which has the flag on Windows, but not on other platforms (where it should not be required).
ABI Checker: use lower-cased decl keywords to be consistent with source. NFC
* 'tensorflow' of github.com:apple/swift: [AutoDiff] Generate transparent ossa reabstraction thunks. (#33897)
[test] diff --strip-trailing-cr is non-standard.
Manually merged upstream commits from apple/swift:master
|
Please test with following PRs: @swift-ci Please clean test TensorFlow |
Add required arg to `product.install_toolchain_path()`
|
Please test with following PRs: @swift-ci Please clean test TensorFlow |
1 similar comment
|
Please test with following PRs: @swift-ci Please clean test TensorFlow |
Update llvm hash in update-checkout-config.json
marcrasi
approved these changes
Sep 18, 2020
dan-zheng
approved these changes
Sep 18, 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.