Merge pull request #25130 from jaredpar/fix-basic3

VB: Unify CreateCompilation helpers

Author: jaredpar

build/Targets/Packages.props

@@ -33,7 +33,7 @@
     <MicrosoftCodeAnalysisCSharpWorkspacesVersion>1.0.1</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
     <MicrosoftCodeAnalysisEditorFeaturesTextVersion>1.0.1</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
     <MicrosoftCodeAnalysisElfieVersion>0.10.6</MicrosoftCodeAnalysisElfieVersion>
-    <MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.7</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
+    <MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.10</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
     <MicrosoftCodeAnalysisVisualBasicVersion>1.0.1</MicrosoftCodeAnalysisVisualBasicVersion>
     <MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>1.0.1</MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>
     <MicrosoftCodeAnalysisWorkspacesCommonVersion>1.0.1</MicrosoftCodeAnalysisWorkspacesCommonVersion>

src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSemanticsTests.cs

@@ -1815,15 +1815,11 @@ private TestData Compile(string source, int expectedIntervals, params Diagnostic
             };
         }
 
-        private CSharpCompilation Compile(string source)
-        {
-            return (CSharpCompilation)GetCompilationForEmit(
-                new[] { source },
-                new MetadataReference[] { },
-                TestOptions.ReleaseDll,
-                TestOptions.Regular
-            );
-        }
+        private CSharpCompilation Compile(string source) =>
+            CreateCompilationWithMscorlib40(
+                source,
+                options: TestOptions.ReleaseDll,
+                parseOptions: TestOptions.Regular);
 
         private static List<TextSpan> ExtractTextIntervals(ref string source)
         {

src/Compilers/CSharp/Test/WinRT/AnonymousTypesSymbolTests.cs

@@ -1942,10 +1942,9 @@ .maxstack  2
   IL_0008:  ret
 }";
 
-
             CompileAndVerify(source).VerifyIL("C.Main", expectedIL);
 
-            var compilation = GetCompilationForEmit(new[] { source }, references: null, options: null, parseOptions: null);
+            var compilation = CreateCompilationWithMscorlib40(source);
             compilation.CreateAnonymousTypeSymbol(
                 ImmutableArray.Create<ITypeSymbol>(compilation.GetSpecialType(SpecialType.System_Int32), compilation.GetSpecialType(SpecialType.System_Boolean)),
                 ImmutableArray.Create("m1", "m2"));

src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs

@@ -43,16 +43,6 @@ private static VisualBasicCompilation CreateCompilationWithMscorlib(string sourc
 
         private sealed class BasicTestBase : CommonTestBase
         {
-            protected override CompilationOptions CompilationOptionsReleaseDll
-            {
-                get { throw new NotImplementedException(); }
-            }
-
-            protected override Compilation GetCompilationForEmit(IEnumerable<string> source, IEnumerable<MetadataReference> additionalRefs, CompilationOptions options, ParseOptions parseOptions)
-            {
-                throw new NotImplementedException();
-            }
-
             internal override string VisualizeRealIL(IModuleSymbol peModule, CodeAnalysis.CodeGen.CompilationTestData.MethodData methodData, IReadOnlyDictionary<int, string> markers)
             {
                 throw new NotImplementedException();

src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs

@@ -239,10 +239,21 @@ Action<IModuleSymbol> translate(Action<ModuleSymbol> action)
                 verify);
         }
 
-        protected override CompilationOptions CompilationOptionsReleaseDll
-        {
-            get { return TestOptions.ReleaseDll; }
-        }
+        internal CompilationVerifier CompileAndVerifyFieldMarshal(CSharpTestSource source, Dictionary<string, byte[]> expectedBlobs, bool isField = true) =>
+            CompileAndVerifyFieldMarshal(
+                source,
+                (s, _) =>
+                {
+                    Assert.True(expectedBlobs.ContainsKey(s), "Expecting marshalling blob for " + (isField ? "field " : "parameter ") + s);
+                    return expectedBlobs[s];
+                },
+                isField);
+
+        internal CompilationVerifier CompileAndVerifyFieldMarshal(CSharpTestSource source, Func<string, PEAssembly, byte[]> getExpectedBlob, bool isField = true) =>
+            CompileAndVerifyFieldMarshalCommon(
+                CreateCompilationWithMscorlib40(source),
+                getExpectedBlob,
+                isField);
 
         #region SyntaxTree Factories
 
@@ -519,22 +530,6 @@ public static MetadataReference CreateMetadataReferenceFromIlSource(string ilSou
             }
         }
 
-        protected override Compilation GetCompilationForEmit(
-            IEnumerable<string> source,
-            IEnumerable<MetadataReference> references,
-            CompilationOptions options,
-            ParseOptions parseOptions)
-        {
-            var single = new[] { MscorlibRef };
-            references = references != null ? single.Concat(references) : single;
-            return CreateEmptyCompilation(
-                source.ToArray(),
-                references: (IEnumerable<MetadataReference>)references,
-                options: (CSharpCompilationOptions)options,
-                parseOptions: (CSharpParseOptions)parseOptions,
-                assemblyName: GetUniqueName());
-        }
-
         /// <summary>
         /// Like CompileAndVerify, but confirms that execution raises an exception.
         /// </summary>

src/Compilers/Test/Utilities/VisualBasic/BasicTestBase.vb

@@ -186,7 +186,7 @@ Public MustInherit Class BasicTestBase
 
         Dim assemblyName As String = Nothing
         Dim sourceTrees = ParseSourceXml(source, parseOptions, assemblyName)
-        Dim compilation = CreateEmptyCompilation(sourceTrees, allReferences, options, assemblyName)
+        Dim compilation = CreateEmptyCompilation(sourceTrees.ToArray(), allReferences, options, assemblyName:=assemblyName)
 
         Return MyBase.CompileAndVerifyCommon(
             compilation,
@@ -225,7 +225,7 @@ Public MustInherit Class BasicTestBase
             options = If(expectedOutput Is Nothing, TestOptions.ReleaseDll, TestOptions.ReleaseExe)
         End If
 
-        Dim compilation = CreateEmptyCompilation(source, allReferences, options, assemblyName, parseOptions)
+        Dim compilation = CreateEmptyCompilation(source, allReferences, options, parseOptions, assemblyName)
 
         Return MyBase.CompileAndVerifyCommon(
             compilation,
@@ -357,8 +357,7 @@ Public MustInherit Class BasicTestBase
     ''' </file>
     ''' </compilation>
     ''' </param>
-    Friend Function CompileWithCustomILSource(source As XElement,
-                                              ilSource As String,
+    Friend Function CompileWithCustomILSource(source As XElement, ilSource As String,
                                               Optional options As VisualBasicCompilationOptions = Nothing,
                                               Optional compilationVerifier As Action(Of VisualBasicCompilation) = Nothing,
                                               Optional expectedOutput As String = Nothing) As CompilationVerifier
@@ -385,6 +384,15 @@ Public MustInherit Class BasicTestBase
         Return CompileAndVerify(compilation, expectedOutput:=expectedOutput)
     End Function
 
+    Friend Overloads Function CompileAndVerifyFieldMarshal(source As String,
+                                                           expectedBlobs As Dictionary(Of String, Byte()),
+                                                           Optional getExpectedBlob As Func(Of String, PEAssembly, Byte()) = Nothing,
+                                                           Optional expectedSignatures As SignatureDescription() = Nothing,
+                                                           Optional isField As Boolean = True) As CompilationVerifier
+        Dim xmlSource = <compilation><field><%= source %></field></compilation>
+        Return CompileAndVerifyFieldMarshal(xmlSource, expectedBlobs, getExpectedBlob, expectedSignatures, isField)
+    End Function
+
     Friend Overloads Function CompileAndVerifyFieldMarshal(source As XElement,
                                                            expectedBlobs As Dictionary(Of String, Byte()),
                                                            Optional getExpectedBlob As Func(Of String, PEAssembly, Byte()) = Nothing,
@@ -409,25 +417,6 @@ Public MustInherit Class BasicTestBase
                                 expectedSignatures:=expectedSignatures)
     End Function
 
-    Protected Overrides ReadOnly Property CompilationOptionsReleaseDll As CompilationOptions
-        Get
-            Return TestOptions.ReleaseDll
-        End Get
-    End Property
-
-    Protected Overrides Function GetCompilationForEmit(
-        source As IEnumerable(Of String),
-        references As IEnumerable(Of MetadataReference),
-        options As CompilationOptions,
-        parseOptions As ParseOptions
-    ) As Compilation
-        Return VisualBasicCompilation.Create(
-            GetUniqueName(),
-            syntaxTrees:=source.Select(Function(t) VisualBasicSyntaxTree.ParseText(t, options:=DirectCast(parseOptions, VisualBasicParseOptions))),
-            references:=If(references IsNot Nothing, DefaultVbReferences.Concat(references), DefaultVbReferences),
-            options:=DirectCast(options, VisualBasicCompilationOptions))
-    End Function
-
     Public Shared Function CreateSubmission(code As String,
                                             Optional references As IEnumerable(Of MetadataReference) = Nothing,
                                             Optional options As VisualBasicCompilationOptions = Nothing,
@@ -466,7 +455,7 @@ Public MustInherit Class BasicTestBase
     End Function
 
     Public Shared Shadows Function GetPdbXml(source As XElement, Optional options As VisualBasicCompilationOptions = Nothing, Optional methodName As String = "") As XElement
-        Dim compilation = CreateCompilationWithMscorlib40(source, options)
+        Dim compilation = CreateCompilationWithMscorlib40(source, options:=options)
         compilation.VerifyDiagnostics()
         Return GetPdbXml(compilation, methodName)
     End Function
@@ -810,8 +799,13 @@ Public MustInherit Class BasicTestBase
 
         Dim fileName = "a.vb"
         Dim syntaxTree = Parse(source, fileName, parseOptions)
-        Dim defaultRefs = If(useLatestFrameworkReferences, LatestVbReferences, DefaultVbReferences)
-        Dim compilation = CreateCompilationWithMscorlib45AndVBRuntime({syntaxTree}, references:=defaultRefs.Append({ValueTupleRef, SystemRuntimeFacadeRef}), options:=If(compilationOptions, TestOptions.ReleaseDll))
+        Dim allReferences As IEnumerable(Of MetadataReference)
+        If useLatestFrameworkReferences Then
+            allReferences = TargetFrameworkUtil.Mscorlib45ExtendedReferences.Add(TestBase.MsvbRef_v4_0_30319_17929)
+        Else
+            allReferences = TargetFrameworkUtil.Mscorlib45ExtendedReferences.Add(TestBase.MsvbRef)
+        End If
+        Dim compilation = CreateEmptyCompilation({syntaxTree}, references:=allReferences, options:=If(compilationOptions, TestOptions.ReleaseDll))
         Dim operationTree = GetOperationTreeForTest(Of TSyntaxNode)(compilation, fileName, which)
         Return (operationTree.tree, operationTree.syntax, operationTree.operation, compilation)
     End Function
@@ -869,10 +863,15 @@ Public MustInherit Class BasicTestBase
 
         Dim fileName = "a.vb"
         Dim syntaxTree = Parse(source, fileName, parseOptions)
-        Dim defaultRefs = If(useLatestFramework, LatestVbReferences, DefaultVbReferences)
-        Dim allReferences = defaultRefs.Concat({ValueTupleRef, SystemRuntimeFacadeRef})
+        Dim allReferences As IEnumerable(Of MetadataReference) = Nothing
+        If useLatestFramework Then
+            allReferences = TargetFrameworkUtil.Mscorlib45ExtendedReferences.Add(TestBase.MsvbRef_v4_0_30319_17929)
+        Else
+            allReferences = TargetFrameworkUtil.Mscorlib45ExtendedReferences.Add(TestBase.MsvbRef)
+        End If
+
         allReferences = If(references IsNot Nothing, allReferences.Concat(references), allReferences)
-        Dim compilation = CreateCompilationWithMscorlib45AndVBRuntime({syntaxTree}, references:=allReferences, options:=If(compilationOptions, TestOptions.ReleaseDll))
+        Dim compilation = CreateEmptyCompilation({syntaxTree}, references:=allReferences, options:=If(compilationOptions, TestOptions.ReleaseDll))
         VerifyOperationTreeAndDiagnosticsForTest(Of TSyntaxNode)(compilation, fileName, expectedOperationTree, expectedDiagnostics, which, additionalOperationTreeVerifier)
     End Sub
 

src/Compilers/Test/Utilities/VisualBasic/BasicTestSource.vb

@@ -0,0 +1,83 @@
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+Imports System.Xml.Linq
+Imports Microsoft.CodeAnalysis.Text
+
+Public Structure BasicTestSource
+
+    Public ReadOnly Property Value As Object
+
+    Private Sub New(value As Object)
+        Me.Value = value
+    End Sub
+
+    Public Function GetSyntaxTrees(
+        Optional parseOptions As VisualBasicParseOptions = Nothing,
+        Optional ByRef assemblyName As String = Nothing,
+        Optional ByRef spans As IEnumerable(Of IEnumerable(Of TextSpan)) = Nothing) As SyntaxTree()
+
+        If Value Is Nothing Then
+            Debug.Assert(parseOptions Is Nothing)
+            Return Array.Empty(Of SyntaxTree)
+        End If
+
+        Dim xmlSource = TryCast(Value, XElement)
+        If xmlSource IsNot Nothing Then
+            Return ParseSourceXml(xmlSource, parseOptions, assemblyName, spans).ToArray()
+        End If
+
+        Dim source = TryCast(Value, String)
+        If source IsNot Nothing Then
+            Return New SyntaxTree() {VisualBasicSyntaxTree.ParseText(source, parseOptions)}
+        End If
+
+        Dim sources = TryCast(Value, String())
+        If sources IsNot Nothing Then
+            Return sources.Select(Function(s) VisualBasicSyntaxTree.ParseText(s, parseOptions)).ToArray()
+        End If
+
+        Dim tree = TryCast(Value, SyntaxTree)
+        If tree IsNot Nothing Then
+            Debug.Assert(parseOptions Is Nothing)
+            Return New SyntaxTree() {tree}
+        End If
+
+        Dim trees = TryCast(Value, SyntaxTree())
+        If trees IsNot Nothing Then
+            Debug.Assert(parseOptions Is Nothing)
+            Return trees
+        End If
+
+        Throw New Exception($"Unexpected value: {Value}")
+    End Function
+
+    ''' <summary>
+    ''' 
+    ''' </summary>
+    ''' <param name="source">The sources compile according to the following schema        
+    ''' &lt;compilation name="assemblyname[optional]"&gt;
+    ''' &lt;file name="file1.vb[optional]"&gt;
+    ''' source
+    ''' &lt;/file&gt;
+    ''' &lt;/compilation&gt;
+    ''' </param>
+    Public Shared Widening Operator CType(source As XElement) As BasicTestSource
+        Return New BasicTestSource(source)
+    End Operator
+
+    Public Shared Widening Operator CType(source As String) As BasicTestSource
+        Return New BasicTestSource(source)
+    End Operator
+
+    Public Shared Widening Operator CType(source As String()) As BasicTestSource
+        Return New BasicTestSource(source)
+    End Operator
+
+    Public Shared Widening Operator CType(source As SyntaxTree) As BasicTestSource
+        Return New BasicTestSource(source)
+    End Operator
+
+    Public Shared Widening Operator CType(source As SyntaxTree()) As BasicTestSource
+        Return New BasicTestSource(source)
+    End Operator
+End Structure