Merge main to feature/tasks #10374
Merged
Merge main to feature/tasks #10374
Conversation
This file contains 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
dsyme
added a commit
that referenced
this pull request
Jul 19, 2021
…ne on parameters (#6811) * Move existing Compiler.ComponentTests to a new Compiler.fs framework (#9839) (#9847) * Move existing Compiler.ComponentTests to a new Compiler.fs framework; Add 'parse' function * Changed some wording in error messages Co-authored-by: Vlad Zarytovskii <[email protected]> * fix build * fix order of diagnostics * update baselines * Delete FSharp.Compiler.Service.fsproj * fix comments * fix comments * fix build * fix build * Reduce number of typeEquiv checks (#10324) (#10374) Co-authored-by: Steffen Forkmann <[email protected]> * xlf * fix build * fix build * fix build * fix build * fix list and array builder perf * better perf testing * better perf testing * better perf testing * update baselines * work on taskSeq { ... } * remove old file * enable all benchmarks * update benchmarks * update baseline * static checking of resumable code * static checking of resumable code * fix build * fix build * fix build * fix build * fix build * fix build * fix baseline * try fix stack overflow * fix up tests * add some negative testing, simplify implementation * fix up tests * fix baseline * fix test and add negative baselines * rename intrinsic and add test for seq case * fix build * fix and rename test * fix test * improve debugging * improve debugging of try/with and try/finally * fix baseline * infer resumable code from single attribute on delegate type * update samples * inline if lambda * update baselines * fix check * delegate and computed function reductions for inlined code * update baselines * update baselines * update test * fix test that failed randomly due to inexact floating point * add tests for generated IL * update tests * don't use InlineIfLambda on sumBy and averageBy due to slight floating point changes * add ability for struct machines to implement additional interfaces (needed for low allocation co-routines) * add coroutines * update baselines * resumable code combinators and tailcalls for coroutines * fix baselinhe * make tasks using shared resumable code combinators the default. Also testing and fixes for dynamic execution of resumable code * update baselines * suppress warning in FSharp.Core * suppress warning in FSharp.Core * fix build * fix build * fix build * update test * only struct state machines * codegen IResumableStateMachine * update baselines * update baselines * notes on sample * fix build * Update coroutine.fs * Negative testing following spec for compilability. Additional testing for dynamic implementation of tasks * simpler coroutine sample, fix build * update baselines * remove unused state vars from internal represenation of object expressions * add coroutine example * update perf benchmarks * remove old files * code cleanup * add compilergenerated attribute, add async2 approximate implementation * test async perf w.r.t. previous compiler, add test for reduced stack trace * using on IAsyncDisposable * remove dynamic Awaiter field from tasks * update surface area * add backgroundTask { ... } * surface area test only for decalred members etc. * fix test * add dynamic tests for backgroundTask * fix codegen bug * fix build * simplify SRTP use in task.fs/fsi * fix build and baselines * fix build * fix build * fix build * fix pacakge * remove RFC FS-1099 from this PR * remove RFC FS-1099 from this PR * backgroundTask only switches to background if necessary * Update tasks.fs * fix test * clear sync context for test * clear sync context for test * update baseline * code review * fix build * fix build * fix clearing state machines * fix to clearing code * improve generated task code and debugging * only update baselines on failure * fix some cases of debug stepping, improve isnull codegen, add more tests * move TaskPerf to benchmarks directory * fix baseline * only update baselines when things changed * fix baselines * update baselines * fix baselines * fix build * fix some tests, add hard error on language version check * reset unchanged files * update baselines * update baselines * fix baseline * fix comparer * flags * Revert "flags" This reverts commit 5b2a011. * fix merge * fix build * fix build * fix build * update baseline * fix build * fix build * update baseline * fix baselines * update baseline * fix build * fix build * update baseline * fix test * code review changes Co-authored-by: Kevin Ransom (msft) <[email protected]> Co-authored-by: Phillip Carter <[email protected]> Co-authored-by: dotnet bot <[email protected]> Co-authored-by: Vlad Zarytovskii <[email protected]> Co-authored-by: Don Syme <[email protected]> Co-authored-by: Steffen Forkmann <[email protected]> Co-authored-by: Brett V. Forsgren <[email protected]>
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.
This is an automatically generated pull request from main into feature/tasks.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout merges/main-to-feature/tasks git reset --hard upstream/feature/tasks git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-feature/tasks --force