Merge master to master-vs-deps #32181
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
…evEx.Open (#29709) * Change Windows build machine affinity to Windows.10.Amd64.ClientRS3.DevEx.Open These machines have .NET Framework 4.7.2
* Allow dispose pattern to be implemented via extension method: - Split pattern lookups into strict, relaxed and extension paths - Use relaxed, followed by extension for dispose lookup - Generate correct call to dispose when it is an extension method - Add tests
* Refactor pattern lookup logic: - Use BindMethodGroupInvocation to perform lookup, rather than manually iterating with LookupMembersInType - Share the pattern logic with GetPinnableReference lookup - Update existing tests to match new logic - Add new tests
Merge dev16.0-preview2 to features/enhanced-using
Originally created when everything was VSTS. This gets us back inline with the new branding.
Cherry pick yaml
* Enable pattern async dispose: - Search for a task-like returning DisposeAsync when await is present - Correctly lower awaitable pattern methods - Add tests
…s: (#31604) * Lookup dispose methods on the underlying type for nullable value types: - Create a conversion from the NVT to the underlying type before searching for dispose - Add tests to cover behavior - Introduce a BoundDisposableValuePlaceholder for finding disposable on nullable value types
* Fix data flow pass to not report using declarations as unused:
- Report using declaration variables as read
- Add test
* Refactor LocalUsingVarRewriter:
- Delete LocalUsingVarRewriter
- Split UsingStatement lowering into visit + make methods
- Split LabelStatement lowering into visit + make methods
- Correctly lower using declarations with instrumentation
- Add tests
* Recursively lower using declarations:
Visit a 'sublist' of statements in a block:
- For each statement in the sublist, visit with the set of statements after it:
- If the statement is a label, recursively visit the body with the same set of following statements
- If the statement is a using declaration, recursively visit the following statements and use those as the body of the using
- Other statements are visited as normal
- If we saw a using during the statement visit, we've finished lowering. If not, continue down the list
* Disallow goto's across using declarations as per LDM decisions:
- Note the using variables in a block, and currently in scope
- When visiting a goto, check the location of the branch and error if it crosses illegally
- Add an extra error to distinguish between forward and backward goto errors
- Add tests
* Add syntax for await using var x = ... - Update syntax nodes - Add parsing tests * Support binding and lowering for await using var x =... - Add awaitable info to bound node - Find and store the awaiter if async - Lower the declaration node correctly - Add tests
* Restrict pattern dispose lookup to ref structs only * Fixup tests: - Remove no longer valid scenarios - Update valid tests * Fix default arguments in extension methods: - Correctly lower extension methods with default arguments - Correctly lower params methods - Add test for params based methods
- Restore ForEachLoopBinder to original state - Rename FindPatternMethodRelaxed - Removed unused copies
Conflicts: azure-pipelines-integration.yml azure-pipelines-official.yml azure-pipelines.yml src/Compilers/CSharp/Portable/Binder/Binder_Statements.cs src/Compilers/CSharp/Portable/Binder/ForEachLoopBinder.cs src/Compilers/CSharp/Portable/Binder/SwitchBinder.cs src/Compilers/CSharp/Portable/Binder/UsingStatementBinder.cs src/Compilers/CSharp/Portable/CSharpResources.Designer.cs src/Compilers/CSharp/Portable/Compiler/MethodCompiler.cs src/Compilers/CSharp/Portable/Errors/ErrorCode.cs src/Compilers/CSharp/Portable/Errors/MessageID.cs src/Compilers/CSharp/Portable/FlowAnalysis/PreciseAbstractFlowPass.cs src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_UsingStatement.cs src/Compilers/CSharp/Portable/PublicAPI.Unshipped.txt src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf src/Compilers/CSharp/Test/Syntax/Parsing/ParsingTests.cs
#32112) * Ensure IOperation/CFG doesn't crash in presence of using declarations: - Make using declarations return operationkind.none - With a child consisting of itself bound as a normal multiple local declaration - When creating bound multiple local declarations, check if it's a using declaration, and make the group implicit if so - Add a couple of placeholder tests
Merge master to enhanced using
Merge master to enahanced using
…d unary expression. Fixes #32161
- Stop classifying EndKeyword in EndUsingStatement - Begin classifying ToKeyword in ForStatement - Begin classifying IfKeyword in TernaryConditionalExpression
Remove prototype comments
Fix async test
Merge Features/enhanced-using to master
Fix parsing regression on switch case expression that is parenthesized unary expression
JoeRobich
force-pushed
the
merges/master-to-master-vs-deps
branch
from
496a774
to
c640ee9
Compare
ghost
merged commit
This pull request was closed.
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 master into master-vs-deps.
git fetch --all git checkout merges/master-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-master-vs-deps --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.