Merge feature/auto-widen to feature/erased-unions #11786
Merged
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
[VS] Scripting fixes
…nstead of strings. (#11733)
… Build ID 1207846 (#11737)
… Build ID 1209209 (#11739)
Co-authored-by: Vlad Zarytovskii <[email protected]>
… Build ID 1209210 (#11740)
prevent exception from race condition in tryGetReflectedDefinition
… Build ID 1211120 (#11745)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <[email protected]>
… Build ID 1211446 (#11746)
* Add FSC option for retrieving raw lexer tokens * Added basic tokenizer switch tests Co-authored-by: Kevin Ransom (msft) <[email protected]> Co-authored-by: Vlad Zarytovskii <[email protected]>
Co-authored-by: Vlad Zarytovskii <[email protected]>
…ted incremental build (#11731) * Added script referencing dll test in WorkspaceTests, but failing * Clear check file caches associated with a re-created incremental build * Minor comment update * Minor comment update * Forgot to delete dll in test * Remove ignore * Using defaultTimeStamp instead of DateTime.MinValue * Added FCS test * Minor update
Co-authored-by: Vlad Zarytovskii <[email protected]>
… Build ID 1214184 (#11757)
* fix 11620 * fix 11620 * fix 11620 Co-authored-by: Don Syme <[email protected]>
… debug points intra-assembly (#11717) * improve debugging of retail code by not erasing locals and debug points intra-assembly * fix ranges for optimized code * fix baselines and range for immediate application of inline function * add manual debug stepping tests and fix test baselines * update baselines * prevent multiple top-level values with the same name * update baselines, add optimized version of codegen test Co-authored-by: Don Syme <[email protected]>
…r` only maintains two states (#11750) * Added IncrementalBuilderInitialState * More changes * Added internal 'block' type for use in the compiler. Lifting functions out of IncrementalBuilder * using block * Block feedback * Use IsEmpty
brettfo
approved these changes
Jul 12, 2021
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 feature/auto-widen into feature/erased-unions.
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/feature/auto-widen-to-feature/erased-unions git reset --hard upstream/feature/erased-unions git merge upstream/feature/auto-widen # Fix merge conflicts git commit git push upstream merges/feature/auto-widen-to-feature/erased-unions --force