Fix conversion issues in null coalescing operator#60202
Merged
jcouv merged 3 commits intodotnet:mainfrom Mar 22, 2022
Merged
Conversation
jcouv
commented
Mar 17, 2022
| if ((object)optRightType != null && optRightType.IsDynamic()) | ||
| { | ||
| var leftPlaceholder = new BoundValuePlaceholder(leftOperand.Syntax, optLeftType).MakeCompilerGenerated(); | ||
| var leftPlaceholder = new BoundValuePlaceholder(leftOperand.Syntax, optLeftType0).MakeCompilerGenerated(); |
Member
Author
There was a problem hiding this comment.
📝 When the LHS of null-coalescing operator is a nullable value type, in the branch where LHS is not null, the lowering does .GetValueOrDefault before converting to the result type. See GetConvertedLeftForNullCoalescingOperator.
In the case of dynamic as result type, this mean we'll do (object)left.GetValueOrDefault, so the conversion here needs to be leftType0 -> object.
Member
Author
|
@dotnet/roslyn-compiler for review. Thanks |
AlekseyTs
reviewed
Mar 17, 2022
AlekseyTs
reviewed
Mar 17, 2022
| // See comments in Binder.BindNullCoalescingOperator referring to GetConvertedLeftForNullCoalescingOperator for more details. | ||
|
|
||
| if (!TypeSymbol.Equals(rewrittenLeftType, rewrittenResultType, TypeCompareKind.ConsiderEverything2) && rewrittenLeftType.IsNullableType()) | ||
| if (!TypeSymbol.Equals(rewrittenLeftType, rewrittenResultType, TypeCompareKind.ConsiderEverything) && rewrittenLeftType.IsNullableType()) |
Contributor
Member
Author
There was a problem hiding this comment.
That is the point of ConsiderEverything2. I think ConsiderEverything is correct here but given this is not central to this PR, I'm reverting.
Contributor
There was a problem hiding this comment.
That is the point of ConsiderEverything2. I think ConsiderEverything is correct here
This isn't that obvious to me. It looks like we are concerned about identity convertibility between the types here. In cases like that ignoring everything (nullable annotations, dynamic vs. object, custom modifiers, ...) feels more appropriate. Changes like this, usually, should be accompanied by tests proving that the used option is appropriate and necessary.
AlekseyTs
reviewed
Mar 17, 2022
AlekseyTs
reviewed
Mar 17, 2022
src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_NullCoalescingOperator.cs
Outdated
Show resolved
Hide resolved
Contributor
|
Done with review pass (commit 1) |
Member
Author
|
Looking at other affected tests... |
AlekseyTs
reviewed
Mar 18, 2022
AlekseyTs
approved these changes
Mar 18, 2022
Contributor
AlekseyTs
left a comment
There was a problem hiding this comment.
LGTM (commit 3), assuming CI is passing
Member
Author
|
@dotnet/roslyn-compiler for second review. Thanks |
RikkiGibson
approved these changes
Mar 21, 2022
| // var x8 = new C() ?? (a: 1, c: 3); // C | ||
| Diagnostic(ErrorCode.WRN_TupleLiteralNameMismatch, "c: 3").WithArguments("c", "(int, int)").WithLocation(18, 36) | ||
| ); | ||
| _ = comp.GetEmitDiagnostics(); |
Member
There was a problem hiding this comment.
Do we exercise this adequately already with the 'TestUsedAssemblies' leg?
| "; | ||
| var comp = CreateCompilation(source); | ||
| comp.VerifyDiagnostics(); | ||
| _ = comp.GetEmitDiagnostics(); |
Member
There was a problem hiding this comment.
Do we need this check? If we do, should we verify what exactly the emit diagnostics are?
Member
Author
There was a problem hiding this comment.
That check was throwing/asserting before. Technically, that check is now embedded in .VerifyDiagnostics() in the new branch, but I wanted to make it explicit in the tests to fix the issue.
| "; | ||
| var compilation = CreateCompilation(source, references: new[] { CSharpRef }); | ||
| compilation.VerifyDiagnostics(); | ||
| compilation.GetEmitDiagnostics(); |
Member
There was a problem hiding this comment.
Similarly: is this needed when we have the VerifyUsedAssemblies leg? And if we do need it, should we verify the set of diagnostics here? Same nit for the below calls to 'GetEmitDiagnostics'.
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 4 pipeline(s). |
333fred
added a commit
to 333fred/roslyn
that referenced
this pull request
Mar 24, 2022
…red-members * upstream/main: (50 commits) Fix top-level speculation (dotnet#60274) Skip CodeDefinitionWindows integration tests Avoid resizing array builder while get unaliased references (dotnet#60220) Fix our x86 test execution (dotnet#60323) [LSP] Don't adjust breakpoints when there are diagnostics in the document (dotnet#60334) Allow VS Mac to access a few options and a helper method (dotnet#60333) Add support for CheckedStatement for smart break line (dotnet#60308) Initialize MEF parts before switching to the UI thread (dotnet#60289) Don't offer convert to switch when an implicit cast is present (dotnet#60224) Fix Add basic TS LSP server (dotnet#59639) Fix issue when multiple different diagnostics share a single fixer Update dependencies from https://github.com/dotnet/arcade build 20220321.2 (dotnet#60315) Check for reference assembly before deciding which language to show (dotnet#60271) Fix XLF files that were manually edited Revert "Fix a typo and an inconsistency" Fix conversion issues in null coalescing operator (dotnet#60202) Fix type parameter scoping for local functions (dotnet#60098) Update SDK version in docs, etc. (dotnet#60299) Edit the breaking change doc for publishing on docs (dotnet#60260) ...
333fred
added a commit
that referenced
this pull request
Mar 25, 2022
* Create solution on the main thread in integration tests * Close solution on the main thread in integration tests * Use cached data for completion of unimported types Even if it might be stale. the completion list would be computed with cached data and cache refresh would be done in background. * Use cached data for completion of unimported extension methods Even if it might be stale. the completion list would be computed with cached data and cache refresh would be done in background. * Try to refresh import completion cache in the background whenever completion is triggered * Use AsyncBatchingWorkQueue for background cache updates * Fix tests * clean up * Fix tests * Make sure background task to update cache always run * Expose ForceExpandedCompletionIndexCreation option to O# This can be used to tweak test behavior to make it deterministic * Don't use Workspace.CurrentSolution when refreshing cache in background * Use AsynchronousOperationListener for background workqueues * Update src/Tools/ExternalAccess/OmniSharp/Completion/OmniSharpCompletionOptions.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> * Pass ThreadingContext.DisposalToken to workqueue for cache refresh * Remove namespace imports * Remove enableRoslynAnalyzers from codespace default settings Follow up to #60165 We don't think this is the right default as users probably don't want this unless they have at least 8 cores. * Fix typo in Apply_namespace_matches_folder_preferences * Remove period at the end to be consistent with other messages * Fix inconsistency in other languages too * Refactoring * Ban incompatible service provider extension methods * Assert window title before closing * Remove outdated comment (#60275) * Don't block on clearing the output window on the UI thread when generating a file (#60281) * Fix issue with remove-unnecessary-cast and necessary explicit casts. * Fix work item * Correct change ObjectCreationExpression to ImplictObjectCreationExpression for SmartBreakline (#60249) * Fix the initializer adding scenario * Fix the initializer removal scenario * Add an Assertion in debug to help if future derive type is added * Remove the check for NewKeyword * Option to always use default symbol servers for GTD (#60053) * pass the listener to the constructor * Edit the breaking change doc for publishing on docs (#60260) Co-authored-by: Rikki Gibson <rikkigibson@gmail.com> * Update SDK version in docs, etc. (#60299) * Fix type parameter scoping for local functions (#60098) Co-authored-by: Youssef1313 <youssefvictor00@gmail.com> * Fix conversion issues in null coalescing operator (#60202) * Revert "Fix a typo and an inconsistency" This reverts #60238 * Fix XLF files that were manually edited * Check for reference assembly before deciding which language to show (#60271) * Update dependencies from https://github.com/dotnet/arcade build 20220321.2 (#60315) [main] Update dependencies from dotnet/arcade * Fix issue when multiple different diagnostics share a single fixer * Add basic TS LSP server (#59639) * Add basic TS LSP server * Add external access layer for TS * Include text sync handlers * Fix build error * Switch to explicit interface impl * Fix namespaces * Remove testing string * Fix * Don't offer convert to switch when an implicit cast is present (#60224) * Initialize MEF parts before switching to the UI thread (#60289) * Add support for CheckedStatement for smart break line (#60308) * Add support for CheckedStatement * Address feedback * Remove a not needed import * Allow VS Mac to access a few options and a helper method (#60333) * [LSP] Don't adjust breakpoints when there are diagnostics in the document (#60334) * Fix our x86 test execution (#60323) * Fix our x86 test execution The transition to `dotnet test` seems to have broken our unit tests that depend on executing on an x86 architecture. This fixes that by using the `--arch` argument to the `dotnet test` execution. This was made more general to facilitate our future arm64 work in this area * Disable test failing on x64 * fix the test * Apply suggestions from code review Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> * Disable test on spanish * Test fixes Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> * Avoid resizing array builder while get unaliased references (#60220) This was being resized constantly after opening Orchard Core, allocating about 2 GB. The fact that is being called this many times appears to be another bug that I'm following up on. * Skip CodeDefinitionWindows integration tests * Fix top-level speculation (#60274) Co-authored-by: Youssef Victor <youssefvictor00@gmail.com> Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com> Co-authored-by: gel@microsoft.com <gel@microsoft.com> Co-authored-by: Gen Lu <genlu@users.noreply.github.com> Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> Co-authored-by: Jonathon Marolf <jmarolf@users.noreply.github.com> Co-authored-by: Daniel Chalmers <daniel.chalmers@outlook.com> Co-authored-by: astroC86 <66444189+astroC86@users.noreply.github.com> Co-authored-by: David Wengier <david.wengier@microsoft.com> Co-authored-by: Cyrus Najmabadi <cyrusn@microsoft.com> Co-authored-by: Shen Chen <Cosifne@users.noreply.github.com> Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com> Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com> Co-authored-by: Bill Wagner <wiwagn@microsoft.com> Co-authored-by: Rikki Gibson <rikkigibson@gmail.com> Co-authored-by: Rikki Gibson <rigibson@microsoft.com> Co-authored-by: Julien Couvreur <jcouv@users.noreply.github.com> Co-authored-by: Youssef1313 <youssefvictor00@gmail.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Joey Robichaud <jorobich@microsoft.com> Co-authored-by: David Barbet <dabarbet@microsoft.com> Co-authored-by: Jared Parsons <jaredpparsons@gmail.com> Co-authored-by: David Kean <davkean@microsoft.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes #60046 (the issue was that
ApplyConversionIfNotIdentitydidn't consider scenario with identity conversion on top of another conversion)Fixes #60059 and fixes #58176 (the issue was that initial binding created a conversion from nullable type to result type, instead of from underlying type to result type)