Merge pull request #28084 from 333fred/remove-workaround

Remove testoperationvisitor workaround now that bug is fixed.

src/Compilers/VisualBasic/Test/Semantic/Semantics/ConditionalAccessTests.vb

@@ -2984,6 +2984,7 @@ C1
 
         End Sub
 
+        <CompilerTrait(CompilerFeature.IOperation)>
         <Fact()>
         Public Sub CodeGen_04()
 
@@ -3034,7 +3035,7 @@ Module Module1
         Call (x(0))?.Test()
     End Sub 
 
-    Sub Test5(Of T As I1)(x as C1(Of T))
+    Sub Test5(Of T As I1)(x as C1(Of T))'BIND:"Sub Test5(Of T As I1)(x as C1(Of T))"
         With x.F2
             ?.Test()
         End With
@@ -3084,6 +3085,32 @@ Test
 102
 ]]>)
 
+            VerifyOperationTreeForTest(Of MethodBlockSyntax)(compilation, "a.vb", expectedOperationTree:="
+IBlockOperation (3 statements) (OperationKind.Block, Type: null) (Syntax: 'Sub Test5(O ... End Sub')
+  IWithOperation (OperationKind.None, Type: null) (Syntax: 'With x.F2 ... End With')
+    Value: 
+      IFieldReferenceOperation: C1(Of T).F2 As T (OperationKind.FieldReference, Type: T) (Syntax: 'x.F2')
+        Instance Receiver: 
+          IParameterReferenceOperation: x (OperationKind.ParameterReference, Type: C1(Of T)) (Syntax: 'x')
+    Body: 
+      IBlockOperation (1 statements) (OperationKind.Block, Type: null, IsImplicit) (Syntax: 'With x.F2 ... End With')
+        IExpressionStatementOperation (OperationKind.ExpressionStatement, Type: null) (Syntax: '?.Test()')
+          Expression: 
+            IConditionalAccessOperation (OperationKind.ConditionalAccess, Type: System.Void) (Syntax: '?.Test()')
+              Operation: 
+                IInstanceReferenceOperation (ReferenceKind: ImplicitReceiver) (OperationKind.InstanceReference, Type: T, IsImplicit) (Syntax: 'x.F2')
+              WhenNotNull: 
+                IInvocationOperation (virtual Sub I1.Test()) (OperationKind.Invocation, Type: System.Void) (Syntax: '.Test()')
+                  Instance Receiver: 
+                    IConditionalAccessInstanceOperation (OperationKind.ConditionalAccessInstance, Type: T, IsImplicit) (Syntax: '?.Test()')
+                  Arguments(0)
+  ILabeledOperation (Label: exit) (OperationKind.Labeled, Type: null, IsImplicit) (Syntax: 'End Sub')
+    Statement: 
+      null
+  IReturnOperation (OperationKind.Return, Type: null, IsImplicit) (Syntax: 'End Sub')
+    ReturnedValue: 
+      null")
+
         End Sub
 
         <Fact()>

src/Test/Utilities/Portable/Compilation/OperationTreeVerifier.cs

@@ -102,6 +102,7 @@ private void LogCommonPropertiesAndNewLine(IOperation operation)
             LogString(")");
 
             // Syntax
+            Assert.NotNull(operation.Syntax);
             LogString($" (Syntax: {GetSnippetFromSyntax(operation.Syntax)})");
 
             LogNewLine();

src/Test/Utilities/Portable/Compilation/TestOperationVisitor.cs

@@ -44,26 +44,17 @@ public override void Visit(IOperation operation)
                 var type = operation.Type;
                 var constantValue = operation.ConstantValue;
 
-                // operation.Language can throw due to https://github.com/dotnet/roslyn/issues/23819
+                Assert.NotNull(syntax);
+                // operation.Language can throw due to https://github.com/dotnet/roslyn/issues/23821
                 // Conditional logic below should be removed once the issue is fixed
-                if (syntax != null)
+                if (syntax is Microsoft.CodeAnalysis.Syntax.SyntaxList)
                 {
-                    // operation.Language can throw due to https://github.com/dotnet/roslyn/issues/23821
-                    // Conditional logic below should be removed once the issue is fixed
-                    if (syntax is Microsoft.CodeAnalysis.Syntax.SyntaxList)
-                    {
-                        Assert.Equal(OperationKind.None, operation.Kind);
-                        Assert.Equal(LanguageNames.CSharp, operation.Parent.Language);
-                    }
-                    else
-                    {
-                        var language = operation.Language;
-                    }
+                    Assert.Equal(OperationKind.None, operation.Kind);
+                    Assert.Equal(LanguageNames.CSharp, operation.Parent.Language);
                 }
                 else
                 {
-                    Assert.Equal(OperationKind.ConditionalAccessInstance, operation.Kind);
-                    Assert.Equal(LanguageNames.VisualBasic, operation.Parent.Language);
+                    var language = operation.Language;
                 }
 
                 var isImplicit = operation.IsImplicit;