Added LambdaDisplayClass to GeneratedNameKind

src/Compilers/VisualBasic/Portable/Symbols/SynthesizedSymbols/GeneratedNameKind.vb

@@ -22,6 +22,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
         AnonymousType
 
         LambdaCacheField
+        LambdaDisplayClass
     End Enum
 
     Partial Friend Class GeneratedNames
@@ -38,7 +39,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
                 Return GeneratedNameKind.HoistedUserVariableField
             ElseIf name.StartsWith(StringConstants.IteratorCurrentFieldName, StringComparison.Ordinal) Then
                 Return GeneratedNameKind.IteratorCurrentField
-            ElseIf name.StartsWith(StringConstants.IteratorInitialThreadIdName, StringComparison.Ordinal)
+            ElseIf name.StartsWith(StringConstants.IteratorInitialThreadIdName, StringComparison.Ordinal) Then
                 Return GeneratedNameKind.IteratorInitialThreadIdField
             ElseIf name.StartsWith(StringConstants.IteratorParameterProxyPrefix, StringComparison.Ordinal) Then
                 Return GeneratedNameKind.IteratorParameterProxyField
@@ -48,6 +49,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
                 Return GeneratedNameKind.StateMachineHoistedUserVariableField
             ElseIf name.StartsWith(AnonymousTypeTemplateNamePrefix, StringComparison.Ordinal) Then
                 Return GeneratedNameKind.AnonymousType
+            ElseIf name.StartsWith(StringConstants.DisplayClassPrefix, StringComparison.Ordinal) Then
+                Return GeneratedNameKind.LambdaDisplayClass
             ElseIf name.Equals(StringConstants.It, StringComparison.Ordinal) OrElse
                     name.Equals(StringConstants.It1, StringComparison.Ordinal) OrElse
                     name.Equals(StringConstants.It2, StringComparison.Ordinal) Then

src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/CompilationContext.vb

@@ -1288,7 +1288,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator
                     Debug.Assert((variableKind = DisplayClassVariableKind.Parameter) OrElse
                         (variableKind = DisplayClassVariableKind.Me))
 
-                    If variableKind = DisplayClassVariableKind.Parameter AndAlso instance.Type.Name.StartsWith(StringConstants.DisplayClassPrefix, StringComparison.Ordinal) Then
+                    If variableKind = DisplayClassVariableKind.Parameter AndAlso GeneratedNames.GetKind(instance.Type.Name) = GeneratedNameKind.LambdaDisplayClass Then
                         displayClassVariablesBuilder(variableName) = instance.ToVariable(variableName, variableKind, field)
                     End If