Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 38aa68de 编写于 作者: N Neal Gafter
浏览文件
操作

Add the module name to generated PrivateImplementationDetails class 

so that there will be no conflict if they are used as netmodules
Fixes #1228
上级 71d351e8
隐藏空白更改
内联 并排
Showing with 162 addition and 118 deletion
src/Compilers/CSharp/Portable/Emitter/Model/PEModuleBuilder.cs
浏览文件 @ 38aa68de
......@@ -16,7 +16,7 @@
namespace Microsoft.CodeAnalysis.CSharp.Emit
{
internal abstract class PEModuleBuilder : PEModuleBuilder<CSharpCompilation, Symbol, SourceModuleSymbol, ModuleSymbol, AssemblySymbol, NamespaceSymbol, TypeSymbol, NamedTypeSymbol, MethodSymbol, CSharpSyntaxNode, NoPia.EmbeddedTypesManager, ModuleCompilationState>
internal abstract class PEModuleBuilder : PEModuleBuilder<CSharpCompilation, SourceModuleSymbol, AssemblySymbol, TypeSymbol, NamedTypeSymbol, MethodSymbol, CSharpSyntaxNode, NoPia.EmbeddedTypesManager, ModuleCompilationState>
{
// TODO: Need to estimate amount of elements for this map and pass that value to the constructor.
protected readonly ConcurrentDictionary<Symbol, Cci.IModuleReference> AssemblyOrModuleSymbolToModuleRefMap = new ConcurrentDictionary<Symbol, Cci.IModuleReference>();
......
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenForEachTests.cs
浏览文件 @ 38aa68de
......@@ -98,7 +98,7 @@ static void Main()
}
}
}";
var compilation = CompileAndVerify(source, expectedOutput: @"
var compilation = CompileAndVerify(source, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: @"
1.2
2.3
3.4
......@@ -121,7 +121,7 @@ .maxstack 3
IL_0001: ldc.i4.4
IL_0002: newobj ""double[*,*]..ctor""
IL_0007: dup
IL_0008: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=64 <PrivateImplementationDetails>.$$method0x6000001-E19C080DB8DAB85AF7CA3EF40FFB01B0778F9D25""
IL_0008: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=64 <PrivateImplementationDetails><MODULE>.E19C080DB8DAB85AF7CA3EF40FFB01B0778F9D25""
IL_000d: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0012: stloc.0
IL_0013: ldloc.0
......
src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTests.cs
浏览文件 @ 38aa68de
......@@ -3231,7 +3231,7 @@ public static void Main()
}
}
";
var compilation = CompileAndVerify(source, expectedOutput: "222333");
var compilation = CompileAndVerify(source, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: "222333");
compilation.VerifyIL("D.Main",
@"{
......@@ -3241,7 +3241,7 @@ .maxstack 4
IL_0000: ldc.i4.4
IL_0001: newarr ""int""
IL_0006: dup
IL_0007: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=16 <PrivateImplementationDetails>.$$method0x6000001-42F1B77334EDFA917032CCF8353020C73F8C62E1""
IL_0007: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=16 <PrivateImplementationDetails><MODULE>.42F1B77334EDFA917032CCF8353020C73F8C62E1""
IL_000c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0011: stloc.0
IL_0012: ldloc.0
......@@ -3560,7 +3560,7 @@ static void Main()
");
#region IL
// Can NOT compare IL because the Guid is different every time - <PrivateImplementationDetails>{a6c2d596-042b-4294-99ab-d34a2758ec15}
// Can NOT compare IL because the Guid is different every time - <PrivateImplementationDetails><MODULE>{a6c2d596-042b-4294-99ab-d34a2758ec15}
#if false
compilation.VerifyIL("MyArray.Main",
@"{
......@@ -3594,7 +3594,7 @@ .maxstack 7
IL_0028: ldc.i4.3
IL_0029: newarr ""byte""
IL_002e: dup
IL_002f: ldtoken ""<PrivateImplementationDetails>{a6c2d596-042b-4294-99ab-d34a2758ec15}.__StaticArrayInitTypeSize=3 <PrivateImplementationDetails>{a6c2d596-042b-4294-99ab-d34a2758ec15}.$$method0x6000001-0""
IL_002f: ldtoken ""<PrivateImplementationDetails><MODULE>{a6c2d596-042b-4294-99ab-d34a2758ec15}.__StaticArrayInitTypeSize=3 <PrivateImplementationDetails><MODULE>{a6c2d596-042b-4294-99ab-d34a2758ec15}.0""
IL_0034: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0039: ldc.i4.0
IL_003a: ldelem.u1
......@@ -3620,7 +3620,7 @@ .maxstack 7
IL_005f: ldc.i4.3
IL_0060: newarr ""short""
IL_0065: dup
IL_0066: ldtoken ""<PrivateImplementationDetails>{a6c2d596-042b-4294-99ab-d34a2758ec15}.__StaticArrayInitTypeSize=6 <PrivateImplementationDetails>{a6c2d596-042b-4294-99ab-d34a2758ec15}.$$method0x6000001-1""
IL_0066: ldtoken ""<PrivateImplementationDetails><MODULE>{a6c2d596-042b-4294-99ab-d34a2758ec15}.__StaticArrayInitTypeSize=6 <PrivateImplementationDetails><MODULE>{a6c2d596-042b-4294-99ab-d34a2758ec15}.1""
IL_006b: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0070: stelem.ref
IL_0071: ldc.i4.1
......@@ -6383,7 +6383,7 @@ public static void Main()
System.Console.WriteLine(d[4]);
}
}";
var compilation = CompileAndVerify(source, expectedOutput: @"
var compilation = CompileAndVerify(source, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: @"
3
-5
True
......@@ -6406,7 +6406,7 @@ .maxstack 3
IL_0000: ldc.i4.5
IL_0001: newarr ""int""
IL_0006: dup
IL_0007: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-56C14CB445C628421AC674599E302B0879FB496F""
IL_0007: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.56C14CB445C628421AC674599E302B0879FB496F""
IL_000c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0011: dup
IL_0012: ldc.i4.2
......@@ -6418,7 +6418,7 @@ .maxstack 3
IL_0020: ldc.i4.5
IL_0021: newarr ""bool""
IL_0026: dup
IL_0027: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=5 <PrivateImplementationDetails>.$$method0x6000001-4E724558F6B816715597A51663AD8F05247E2C4A""
IL_0027: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=5 <PrivateImplementationDetails><MODULE>.4E724558F6B816715597A51663AD8F05247E2C4A""
IL_002c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0031: dup
IL_0032: ldc.i4.2
......@@ -6430,7 +6430,7 @@ .maxstack 3
IL_0040: ldc.i4.5
IL_0041: newarr ""byte""
IL_0046: dup
IL_0047: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=5 <PrivateImplementationDetails>.$$method0x6000001-9755240DD0C4C1AD226DEBD40C6D2EBD408250CB""
IL_0047: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=5 <PrivateImplementationDetails><MODULE>.9755240DD0C4C1AD226DEBD40C6D2EBD408250CB""
IL_004c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0051: dup
IL_0052: ldc.i4.2
......@@ -6442,7 +6442,7 @@ .maxstack 3
IL_0060: ldc.i4.5
IL_0061: newarr ""char""
IL_0066: dup
IL_0067: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=10 <PrivateImplementationDetails>.$$method0x6000001-E313A2813013780396D58750DC5D62221C86F42F""
IL_0067: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=10 <PrivateImplementationDetails><MODULE>.E313A2813013780396D58750DC5D62221C86F42F""
IL_006c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0071: dup
IL_0072: ldc.i4.2
......@@ -6454,7 +6454,7 @@ .maxstack 3
IL_0080: ldc.i4.5
IL_0081: newarr ""float""
IL_0086: dup
IL_0087: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-2F3DD953DBFB23217E7CE0E76630EBD31267E237""
IL_0087: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.2F3DD953DBFB23217E7CE0E76630EBD31267E237""
IL_008c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0091: dup
IL_0092: ldc.i4.2
......@@ -6466,7 +6466,7 @@ .maxstack 3
IL_00a0: ldc.i4.5
IL_00a1: newarr ""double""
IL_00a6: dup
IL_00a7: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=40 <PrivateImplementationDetails>.$$method0x6000001-11F3436B917FFBA0FAB0FAD5563AF18FA24AC16A""
IL_00a7: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=40 <PrivateImplementationDetails><MODULE>.11F3436B917FFBA0FAB0FAD5563AF18FA24AC16A""
IL_00ac: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_00b1: dup
IL_00b2: ldc.i4.2
......@@ -6499,8 +6499,8 @@ public static void Main()
}
}
";
var compilation = CompileAndVerify(source, expectedOutput: @"3-5");
//string pid = "<PrivateImplementationDetails>" + compilation.Compilation.SourceModule.Pers
var compilation = CompileAndVerify(source, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: @"3-5");
//string pid = "<PrivateImplementationDetails><MODULE>" + compilation.Compilation.SourceModule.Pers
compilation.VerifyIL("D.Main",
@"{
// Code size 73 (0x49)
......@@ -6509,7 +6509,7 @@ .maxstack 5
IL_0000: ldc.i4.5
IL_0001: newarr ""int""
IL_0006: dup
IL_0007: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-FF942E5F620FC460CF9424D564C73AD8A99C74EE""
IL_0007: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.FF942E5F620FC460CF9424D564C73AD8A99C74EE""
IL_000c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0011: dup
IL_0012: ldc.i4.2
......@@ -6524,7 +6524,7 @@ .maxstack 5
IL_0027: ldc.i4.5
IL_0028: newarr ""int""
IL_002d: dup
IL_002e: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-89E37886EEEDC70AEF61138E037CC60EFC35535F""
IL_002e: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.89E37886EEEDC70AEF61138E037CC60EFC35535F""
IL_0033: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0038: dup
IL_0039: ldc.i4.4
......@@ -6561,8 +6561,8 @@ public static void Main()
}
}
";
var compilation = CompileAndVerify(source, expectedOutput: @"30");
//string pid = "<PrivateImplementationDetails>" + compilation.Compilation.SourceModule.Pers
var compilation = CompileAndVerify(source, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: @"30");
//string pid = "<PrivateImplementationDetails><MODULE>" + compilation.Compilation.SourceModule.Pers
compilation.VerifyIL("D.Main",
@"{
// Code size 82 (0x52)
......@@ -6592,7 +6592,7 @@ .maxstack 5
IL_002e: ldc.i4.s 15
IL_0030: newarr ""int""
IL_0035: dup
IL_0036: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=60 <PrivateImplementationDetails>.$$method0x6000001-49608711F905702F9F227AA782F8B408777D5DF9""
IL_0036: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=60 <PrivateImplementationDetails><MODULE>.49608711F905702F9F227AA782F8B408777D5DF9""
IL_003b: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0040: dup
IL_0041: ldc.i4.s 12
......@@ -6716,7 +6716,7 @@ public static void Main()
DBNull
";
var compilation = CreateCompilationWithMscorlib45(source: source, options: TestOptions.ReleaseExe);
var compilation = CreateCompilationWithMscorlib45(source: source, options: TestOptions.ReleaseExe.WithModuleName("MODULE"));
var verifier = CompileAndVerify(compilation, expectedOutput: expectedOutput);
//NOTE:
......@@ -6728,7 +6728,7 @@ .maxstack 3
IL_0000: ldc.i4.5
IL_0001: newarr ""System.TypeCode""
IL_0006: dup
IL_0007: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-3191FF614021ADF3122AC274EA5B6097C21BEB81""
IL_0007: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.3191FF614021ADF3122AC274EA5B6097C21BEB81""
IL_000c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0011: dup
IL_0012: ldc.i4.1
......@@ -7240,7 +7240,7 @@ static void Main()
}
}
";
var compilation = CompileAndVerify(source, expectedOutput: @"
var compilation = CompileAndVerify(source, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: @"
F1=3, F2=33
444
127
......@@ -7301,7 +7301,7 @@ .maxstack 6
IL_0085: ldc.i4.4
IL_0086: newarr ""ushort""
IL_008b: dup
IL_008c: ldtoken ""long <PrivateImplementationDetails>.$$method0x6000001-E9E8A66A117598333ABACF5B65971C2366E19B6C""
IL_008c: ldtoken ""long <PrivateImplementationDetails><MODULE>.E9E8A66A117598333ABACF5B65971C2366E19B6C""
IL_0091: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0096: callvirt ""uint Program.C.Foo(out short, params ushort[])""
IL_009b: call ""void System.Console.WriteLine(uint)""
......@@ -7523,7 +7523,7 @@ public static void Main()
}
";
var compilation = CompileAndVerify(source, options: TestOptions.DebugExe);
var compilation = CompileAndVerify(source, options: TestOptions.DebugExe.WithModuleName("MODULE"));
compilation.VerifyIL("A.Main",
@"{
......@@ -7534,7 +7534,7 @@ .maxstack 3
IL_0001: ldc.i4.5
IL_0002: newarr ""int""
IL_0007: dup
IL_0008: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-1036C5F8EF306104BD582D73E555F4DAE8EECB24""
IL_0008: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.1036C5F8EF306104BD582D73E555F4DAE8EECB24""
IL_000d: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0012: stloc.0
IL_0013: ret
......@@ -13006,7 +13006,7 @@ static void Run()
}
}
";
var compilation = CompileAndVerify(source, expectedOutput: @"False
var compilation = CompileAndVerify(source, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: @"False
True
System.Exception: Exception of type 'System.Exception' was thrown.
......@@ -13047,7 +13047,7 @@ .maxstack 4
IL_0040: ldc.i4.4
IL_0041: newarr ""bool""
IL_0046: dup
IL_0047: ldtoken ""int <PrivateImplementationDetails>.$$method0x6000001-35CCB1599F52363510686EF38B7DB5E7998DB108""
IL_0047: ldtoken ""int <PrivateImplementationDetails><MODULE>.35CCB1599F52363510686EF38B7DB5E7998DB108""
IL_004c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0051: ldc.i4.2
IL_0052: ldelem.u1
......
src/Compilers/CSharp/Test/Emit/CodeGen/IndexerTests.cs
浏览文件 @ 38aa68de
......@@ -415,7 +415,7 @@ static void Main()
}
}
";
var compVerifier = CompileAndVerify(text);
var compVerifier = CompileAndVerify(text, options: TestOptions.ReleaseExe.WithModuleName("MODULE"));
compVerifier.VerifyIL("Test.Main", @"
{
......@@ -458,7 +458,7 @@ .maxstack 4
IL_003f: ldc.i4.3
IL_0040: newarr ""int""
IL_0045: dup
IL_0046: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_0046: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_004b: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0050: callvirt ""int C.this[params int[]].get""
IL_0055: pop
......@@ -466,7 +466,7 @@ .maxstack 4
IL_0057: ldc.i4.3
IL_0058: newarr ""int""
IL_005d: dup
IL_005e: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_005e: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_0063: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0068: callvirt ""int C.this[params int[]].get""
IL_006d: pop
......@@ -563,7 +563,7 @@ static void Main()
}
}
";
var compVerifier = CompileAndVerify(text);
var compVerifier = CompileAndVerify(text, options: TestOptions.ReleaseExe.WithModuleName("MODULE"));
compVerifier.VerifyIL("Test.Main", @"
{
......@@ -606,7 +606,7 @@ .maxstack 4
IL_003f: ldc.i4.3
IL_0040: newarr ""int""
IL_0045: dup
IL_0046: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_0046: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_004b: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0050: ldc.i4.4
IL_0051: callvirt ""void C.this[params int[]].set""
......@@ -614,7 +614,7 @@ .maxstack 4
IL_0057: ldc.i4.3
IL_0058: newarr ""int""
IL_005d: dup
IL_005e: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_005e: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_0063: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0068: ldc.i4.4
IL_0069: callvirt ""void C.this[params int[]].set""
......@@ -711,7 +711,7 @@ static void Main()
}
}
";
var compVerifier = CompileAndVerify(text);
var compVerifier = CompileAndVerify(text, options: TestOptions.ReleaseExe.WithModuleName("MODULE"));
compVerifier.VerifyIL("Test.Main", @"
{
......@@ -800,7 +800,7 @@ .maxstack 5
IL_0084: ldc.i4.3
IL_0085: newarr ""int""
IL_008a: dup
IL_008b: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_008b: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_0090: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0095: stloc.3
IL_0096: ldloc.2
......@@ -818,7 +818,7 @@ .maxstack 5
IL_00aa: ldc.i4.3
IL_00ab: newarr ""int""
IL_00b0: dup
IL_00b1: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_00b1: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_00b6: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_00bb: stloc.3
IL_00bc: ldloc.2
......@@ -936,7 +936,7 @@ static void Main()
}
}
";
var compVerifier = CompileAndVerify(text);
var compVerifier = CompileAndVerify(text, options: TestOptions.ReleaseExe.WithModuleName("MODULE"));
compVerifier.VerifyIL("Test.Main", @"
{
......@@ -1030,7 +1030,7 @@ .maxstack 6
IL_00a2: ldc.i4.3
IL_00a3: newarr ""int""
IL_00a8: dup
IL_00a9: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_00a9: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_00ae: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_00b3: stloc.2
IL_00b4: ldloc.1
......@@ -1047,7 +1047,7 @@ .maxstack 6
IL_00cb: ldc.i4.3
IL_00cc: newarr ""int""
IL_00d1: dup
IL_00d2: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_00d2: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_00d7: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_00dc: stloc.2
IL_00dd: ldloc.1
......
src/Compilers/CSharp/Test/Emit/CodeGen/SwitchTests.cs
浏览文件 @ 38aa68de
......@@ -2137,7 +2137,7 @@ public static void Main()
Console.WriteLine(success);
}
}";
var compVerifier = CompileAndVerify(text, expectedOutput: "True");
var compVerifier = CompileAndVerify(text, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: "True");
compVerifier.VerifyIL("Test.M", @"
{
......@@ -2160,7 +2160,7 @@ .maxstack 3
IL_001a: callvirt ""string string.Remove(int, int)""
IL_001f: starg.s V_0
IL_0021: ldarg.0
IL_0022: call ""$$method0x6000001-ComputeStringHash""
IL_0022: call ""ComputeStringHash""
IL_0027: stloc.1
IL_0028: ldloc.1
IL_0029: ldc.i4 0xc60bf9f2
......@@ -2283,7 +2283,7 @@ .maxstack 3
var reference = compVerifier.Compilation.EmitToImageReference();
var comp = CSharpCompilation.Create("Name", references: new[] { reference }, options: TestOptions.ReleaseDll.WithMetadataImportOptions(MetadataImportOptions.Internal));
var pid = ((NamedTypeSymbol)comp.GlobalNamespace.GetMembers().Single(s => s.Name.StartsWith("<PrivateImplementationDetails>", StringComparison.Ordinal)));
var pid = ((NamedTypeSymbol)comp.GlobalNamespace.GetMembers().Single(s => s.Name.StartsWith("<PrivateImplementationDetails><MODULE>", StringComparison.Ordinal)));
var member = pid.GetMembers(PrivateImplementationDetails.SynthesizedStringHashFunctionName).Single();
Assert.Equal(Accessibility.Internal, member.DeclaredAccessibility);
}
......@@ -2487,7 +2487,7 @@ public static void Main()
Console.Write(status);
}
}";
var compVerifier = CompileAndVerify(text, expectedOutput: "PASS");
var compVerifier = CompileAndVerify(text, options: TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput: "PASS");
compVerifier.VerifyIL("Test.Switcheroo", @"
{
......@@ -2508,7 +2508,7 @@ .maxstack 3
IL_0017: callvirt ""string string.Remove(int, int)""
IL_001c: starg.s V_0
IL_001e: ldarg.0
IL_001f: call ""$$method0x6000001-ComputeStringHash""
IL_001f: call ""ComputeStringHash""
IL_0024: stloc.1
IL_0025: ldloc.1
IL_0026: ldc.i4 0xb2f29419
......@@ -6159,7 +6159,7 @@ public static void Main(string [] args)
}
}";
var comp = CreateCompilationWithMscorlib(text);
var comp = CreateCompilationWithMscorlib(text, options: TestOptions.ReleaseExe.WithModuleName("MODULE"));
CompileAndVerify(comp).VerifyIL("Test.Main", @"
{
// Code size 328 (0x148)
......@@ -6181,7 +6181,7 @@ .maxstack 2
IL_0019: ldelem.ref
IL_001a: stloc.0
IL_001b: ldloc.0
IL_001c: call ""$$method0x6000001-ComputeStringHash""
IL_001c: call ""ComputeStringHash""
IL_0021: stloc.1
IL_0022: ldloc.1
IL_0023: ldc.i4 0xc30bf539
......@@ -6326,7 +6326,7 @@ public static void Main(string [] args)
}
}";
var comp = CreateCompilationWithMscorlib(text);
var comp = CreateCompilationWithMscorlib(text, options: TestOptions.ReleaseExe.WithModuleName("MODULE"));
// With special members available, we use a hashtable approach.
CompileAndVerify(comp).VerifyIL("Test.Main", @"
......@@ -6340,7 +6340,7 @@ .maxstack 2
IL_0002: ldelem.ref
IL_0003: stloc.0
IL_0004: ldloc.0
IL_0005: call ""$$method0x6000001-ComputeStringHash""
IL_0005: call ""ComputeStringHash""
IL_000a: stloc.1
IL_000b: ldloc.1
IL_000c: ldc.i4 0xc30bf539
......
src/Compilers/CSharp/Test/Emit/Emit/CompilationEmitTests.cs
浏览文件 @ 38aa68de
......@@ -2681,5 +2681,51 @@ public void BrokenPDBStream()
Assert.Equal(1, err.Arguments.Count);
Assert.True(((string)err.Arguments[0]).EndsWith(" HRESULT: 0x806D0004", StringComparison.Ordinal));
}
[Fact]
public void MultipleNetmodulesWithPrivateImplementationDetails()
{
var s1 = @"
public class A
{
private static char[] contents = { 'H', 'e', 'l', 'l', 'o', ',', ' ' };
public static string M1()
{
return new string(contents);
}
}";
var s2 = @"
public class B : A
{
private static char[] contents = { 'w', 'o', 'r', 'l', 'd', '!' };
public static string M2()
{
return new string(contents);
}
}";
var s3 = @"
public class Program
{
public static void Main(string[] args)
{
System.Console.Write(A.M1());
System.Console.WriteLine(B.M2());
}
}";
var comp1 = CreateCompilationWithMscorlib(s1, options: TestOptions.ReleaseModule);
comp1.VerifyDiagnostics();
var ref1 = ModuleMetadata.CreateFromStream(comp1.EmitToStream()).GetReference();
var comp2 = CreateCompilationWithMscorlib(s2, options: TestOptions.ReleaseModule, references: new[] { ref1 });
comp2.VerifyDiagnostics();
var ref2 = ModuleMetadata.CreateFromStream(comp2.EmitToStream()).GetReference();
var comp3 = CreateCompilationWithMscorlib(s3, options: TestOptions.ReleaseExe, references: new[] { ref1, ref2 });
comp3.VerifyDiagnostics(
////// error CS0101: The namespace '<global namespace>' already contains a definition for '<PrivateImplementationDetails>'
////Diagnostic(ErrorCode.ERR_DuplicateNameInNS).WithArguments("<PrivateImplementationDetails>", "<global namespace>").WithLocation(1, 1)
);
CompileAndVerify(comp3, emitOptions: TestEmitters.RefEmitBug, expectedOutput: "Hello, world!");
}
}
}
src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs
浏览文件 @ 38aa68de
......@@ -2502,7 +2502,7 @@ static void M()
System.Console.WriteLine(a[1]);
}
}";
var compilation0 = CreateCompilationWithMscorlib(source0, options: TestOptions.DebugDll);
var compilation0 = CreateCompilationWithMscorlib(source0, options: TestOptions.DebugDll.WithModuleName("MODULE"));
var compilation1 = compilation0.WithSource(source1);
var compilation2 = compilation1.WithSource(source2);
......@@ -2519,7 +2519,7 @@ .maxstack 3
IL_0001: ldc.i4.3
IL_0002: newarr ""int""
IL_0007: dup
IL_0008: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_0008: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_000d: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0012: stloc.0
IL_0013: ldloc.0
......@@ -2817,7 +2817,7 @@ static int F(string s)
}
}
}";
const string ComputeStringHashName = "$$method0x6000001-ComputeStringHash";
const string ComputeStringHashName = "ComputeStringHash";
var compilation0 = CreateCompilationWithMscorlib(source, options: TestOptions.DebugDll);
var compilation1 = compilation0.WithSource(source);
......@@ -2828,7 +2828,7 @@ static int F(string s)
var generation0 = EmitBaseline.CreateInitialBaseline(ModuleMetadata.CreateFromImage(bytes0), methodData0.EncDebugInfoProvider());
// Should have generated call to ComputeStringHash and
// added the method to <PrivateImplementationDetails>.
// added the method to <PrivateImplementationDetails><MODULE>.
var actualIL0 = methodData0.GetMethodIL();
Assert.True(actualIL0.Contains(ComputeStringHashName));
......@@ -2843,7 +2843,7 @@ static int F(string s)
ImmutableArray.Create(new SemanticEdit(SemanticEditKind.Update, method0, method1, GetEquivalentNodesMap(method1, method0), preserveLocalVariables: true)));
// Should not have generated call to ComputeStringHash nor
// added the method to <PrivateImplementationDetails>.
// added the method to <PrivateImplementationDetails><MODULE>.
var actualIL1 = diff1.GetMethodIL("C.F");
Assert.False(actualIL1.Contains(ComputeStringHashName));
......
src/Compilers/CSharp/Test/Emit/PDB/PDBTests.cs
浏览文件 @ 38aa68de
......@@ -1109,7 +1109,7 @@ static void Main()
}
}
";
var v = CompileAndVerify(source, options: TestOptions.DebugDll);
var v = CompileAndVerify(source, options: TestOptions.DebugDll.WithModuleName("MODULE"));
// Stepping:
// After "continue", step to "in".
......@@ -1135,7 +1135,7 @@ .maxstack 4
IL_0003: ldc.i4.2
IL_0004: newobj ""int[*,*,*]..ctor""
IL_0009: dup
IL_000a: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=32 <PrivateImplementationDetails>.$$method0x6000001-EB196F988F4F427D318CA25B68671CF3A4510012""
IL_000a: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=32 <PrivateImplementationDetails><MODULE>.EB196F988F4F427D318CA25B68671CF3A4510012""
IL_000f: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0014: stloc.0
-IL_0015: nop
......
src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs
浏览文件 @ 38aa68de
......@@ -5241,7 +5241,7 @@ .maxstack 4
IL_005b: ldc.i4.5
IL_005c: newarr ""int""
IL_0061: dup
IL_0062: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-864782BF337E3DBC1A27023D5C0C065C80F17087""
IL_0062: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.864782BF337E3DBC1A27023D5C0C065C80F17087""
IL_0067: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_006c: ldloc.0
IL_006d: ldftn ""bool AllMembers.<>c__DisplayClass3_0.<TestLINQ>b__0(int)""
......
src/Compilers/Core/Portable/CodeGen/PrivateImplementationDetails.cs
浏览文件 @ 38aa68de
......@@ -23,17 +23,16 @@ internal sealed class PrivateImplementationDetails : DefaultTypeDef, Cci.INamesp
{
// Note: Dev11 uses the source method token as the prefix, rather than a fixed token
// value, and data field offsets are unique within the method, not across all methods.
private const string MemberNamePrefix = "$$method0x6000001-";
internal const string SynthesizedStringHashFunctionName = MemberNamePrefix + "ComputeStringHash";
internal const string SynthesizedStringHashFunctionName = "ComputeStringHash";
private readonly Cci.IModule _module; //parent unit
private readonly Cci.IModule _moduleBuilder; //parent unit
private readonly Cci.ITypeReference _systemObject; //base type
private readonly Cci.ITypeReference _systemValueType; //base for nested structs
private readonly Cci.ITypeReference _systemInt8Type; //for metadata init of short arrays
private readonly Cci.ITypeReference _systemInt8Type; //for metadata init of byte arrays
private readonly Cci.ITypeReference _systemInt16Type; //for metadata init of short arrays
private readonly Cci.ITypeReference _systemInt32Type; //for metadata init of short arrays
private readonly Cci.ITypeReference _systemInt64Type; //for metadata init of short arrays
private readonly Cci.ITypeReference _systemInt32Type; //for metadata init of int arrays
private readonly Cci.ITypeReference _systemInt64Type; //for metadata init of long arrays
private readonly Cci.ICustomAttribute _compilerGeneratedAttribute;
......@@ -57,7 +56,8 @@ internal sealed class PrivateImplementationDetails : DefaultTypeDef, Cci.INamesp
private readonly ConcurrentDictionary<uint, Cci.ITypeReference> _proxyTypes = new ConcurrentDictionary<uint, Cci.ITypeReference>();
internal PrivateImplementationDetails(
Cci.IModule module,
Cci.IModule moduleBuilder,
string moduleName,
int submissionSlotIndex,
Cci.ITypeReference systemObject,
Cci.ITypeReference systemValueType,
......@@ -67,11 +67,10 @@ internal sealed class PrivateImplementationDetails : DefaultTypeDef, Cci.INamesp
Cci.ITypeReference systemInt64Type,
Cci.ICustomAttribute compilerGeneratedAttribute)
{
Debug.Assert(module != null);
Debug.Assert(systemObject != null);
Debug.Assert(systemValueType != null);
_module = module;
_moduleBuilder = moduleBuilder;
_systemObject = systemObject;
_systemValueType = systemValueType;
......@@ -81,12 +80,12 @@ internal sealed class PrivateImplementationDetails : DefaultTypeDef, Cci.INamesp
_systemInt64Type = systemInt64Type;
_compilerGeneratedAttribute = compilerGeneratedAttribute;
_name = GetClassName(submissionSlotIndex);
_name = GetClassName(moduleName, submissionSlotIndex);
}
internal static string GetClassName(int submissionSlotIndex)
internal static string GetClassName(string moduleName, int submissionSlotIndex)
{
return "<PrivateImplementationDetails>" + (submissionSlotIndex >= 0 ? submissionSlotIndex.ToString() : "");
return $"<PrivateImplementationDetails>{(submissionSlotIndex >= 0 ? submissionSlotIndex.ToString() : "")}<{moduleName}>";
}
internal void Freeze()
......@@ -197,8 +196,8 @@ public override void Dispatch(Cci.MetadataVisitor visitor)
public Cci.IUnitReference GetUnit(EmitContext context)
{
Debug.Assert(context.Module == _module);
return _module;
Debug.Assert(context.Module == _moduleBuilder);
return _moduleBuilder;
}
public string NamespaceName => string.Empty;
......@@ -214,7 +213,7 @@ internal static string GenerateDataFieldName(ImmutableArray<byte> data)
c[i++] = Hexchar(b & 0xF);
}
return MemberNamePrefix + new string(c);
return new string(c);
}
private static char Hexchar(int x)
......
src/Compilers/Core/Portable/Emit/CommonPEModuleBuilder.cs
浏览文件 @ 38aa68de
......@@ -28,16 +28,13 @@ internal abstract class CommonPEModuleBuilder
/// <summary>
/// Common base class for C# and VB PE module builder.
/// </summary>
internal abstract class PEModuleBuilder<TCompilation, TSymbol, TSourceModuleSymbol, TModuleSymbol, TAssemblySymbol, TNamespaceSymbol, TTypeSymbol, TNamedTypeSymbol, TMethodSymbol, TSyntaxNode, TEmbeddedTypesManager, TModuleCompilationState> : CommonPEModuleBuilder, Cci.IModule, ITokenDeferral
internal abstract class PEModuleBuilder<TCompilation, TSourceModuleSymbol, TAssemblySymbol, TTypeSymbol, TNamedTypeSymbol, TMethodSymbol, TSyntaxNode, TEmbeddedTypesManager, TModuleCompilationState> : CommonPEModuleBuilder, Cci.IModule, ITokenDeferral
where TCompilation : Compilation
where TSymbol : class
where TSourceModuleSymbol : class, TModuleSymbol
where TModuleSymbol : class, TSymbol
where TAssemblySymbol : class, TSymbol
where TNamespaceSymbol : class, TSymbol
where TTypeSymbol : class, TSymbol
where TSourceModuleSymbol : class, IModuleSymbol
where TAssemblySymbol : class
where TTypeSymbol : class
where TNamedTypeSymbol : class, TTypeSymbol, Cci.INamespaceTypeDefinition
where TMethodSymbol : class, TSymbol, Cci.IMethodDefinition
where TMethodSymbol : class, Cci.IMethodDefinition
where TSyntaxNode : SyntaxNode
where TEmbeddedTypesManager : NoPia.CommonEmbeddedTypesManager
where TModuleCompilationState : ModuleCompilationState<TNamedTypeSymbol, TMethodSymbol>
......@@ -654,6 +651,7 @@ internal PrivateImplementationDetails GetPrivateImplClass(TSyntaxNode syntaxNode
{
result = new PrivateImplementationDetails(
this,
this.SourceModule.Name,
_compilation.GetSubmissionSlotIndex(),
this.GetSpecialType(SpecialType.System_Object, syntaxNodeOpt, diagnostics),
this.GetSpecialType(SpecialType.System_ValueType, syntaxNodeOpt, diagnostics),
......
src/Compilers/VisualBasic/Portable/Emit/PEModuleBuilder.vb
浏览文件 @ 38aa68de
......@@ -12,7 +12,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Namespace Microsoft.CodeAnalysis.VisualBasic.Emit
Partial Friend MustInherit Class PEModuleBuilder
Inherits PEModuleBuilder(Of VisualBasicCompilation, Symbol, SourceModuleSymbol, ModuleSymbol, AssemblySymbol, NamespaceSymbol, TypeSymbol, NamedTypeSymbol, MethodSymbol, VisualBasicSyntaxNode, NoPia.EmbeddedTypesManager, ModuleCompilationState)
Inherits PEModuleBuilder(Of VisualBasicCompilation, SourceModuleSymbol, AssemblySymbol, TypeSymbol, NamedTypeSymbol, MethodSymbol, VisualBasicSyntaxNode, NoPia.EmbeddedTypesManager, ModuleCompilationState)
' Not many methods should end up here.
Private ReadOnly _disableJITOptimization As ConcurrentDictionary(Of MethodSymbol, Boolean) = New ConcurrentDictionary(Of MethodSymbol, Boolean)(ReferenceEqualityComparer.Instance)
......
src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenForeach.vb
浏览文件 @ 38aa68de
......@@ -82,7 +82,7 @@ Class C
End Sub
End Class
</file>
</compilation>, options:=TestOptions.ReleaseExe).VerifyIL("C.Main", <![CDATA[
</compilation>, options:=TestOptions.ReleaseExe.WithModuleName("MODULE")).VerifyIL("C.Main", <![CDATA[
{
// Code size 37 (0x25)
.maxstack 3
......@@ -91,7 +91,7 @@ End Class
IL_0000: ldc.i4.3
IL_0001: newarr "Integer"
IL_0006: dup
IL_0007: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E"
IL_0007: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E"
IL_000c: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0011: stloc.0
IL_0012: ldc.i4.0
......@@ -913,7 +913,7 @@ Class C
End Sub
End Class
</file>
</compilation>, additionalRefs:={LinqAssemblyRef}, expectedOutput:=<![CDATA[
</compilation>, options:=TestOptions.ReleaseExe.WithModuleName("MODULE"), additionalRefs:={LinqAssemblyRef}, expectedOutput:=<![CDATA[
1
2
3
......@@ -927,7 +927,7 @@ End Class
IL_0000: ldc.i4.3
IL_0001: newarr "Integer"
IL_0006: dup
IL_0007: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E"
IL_0007: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E"
IL_000c: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0011: ldsfld "C._Closure$__.$I1-0 As System.Func(Of Integer, String)"
IL_0016: brfalse.s IL_001f
......@@ -3028,7 +3028,7 @@ Class C
End Sub
End Class
</file>
</compilation>, expectedOutput:=<![CDATA[
</compilation>, options:=TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput:=<![CDATA[
1
2
3
......@@ -3041,7 +3041,7 @@ End Class
IL_0000: ldc.i4.3
IL_0001: newarr "Integer"
IL_0006: dup
IL_0007: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E"
IL_0007: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E"
IL_000c: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0011: stloc.0
.try
......
src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenMultiDimensionalArray.vb
浏览文件 @ 38aa68de
......@@ -19,7 +19,7 @@ public Module A
End Sub
End Module
</file>
</compilation>,
</compilation>, options:=TestOptions.ReleaseExe.WithModuleName("MODULE"),
expectedOutput:="2").
VerifyIL("A.Main",
<![CDATA[
......@@ -30,7 +30,7 @@ End Module
IL_0001: ldc.i4.3
IL_0002: newobj "Integer(*,*)..ctor"
IL_0007: dup
IL_0008: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=24 <PrivateImplementationDetails>.$$method0x6000001-D64E555B758C5B66DFAC42F18587BB1B3C9BCFA8"
IL_0008: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=24 <PrivateImplementationDetails><MODULE>.D64E555B758C5B66DFAC42F18587BB1B3C9BCFA8"
IL_000d: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0012: ldc.i4.1
IL_0013: ldc.i4.1
......@@ -53,7 +53,7 @@ public Module A
End Sub
End Module
</file>
</compilation>,
</compilation>, options:=TestOptions.ReleaseExe.WithModuleName("MODULE"),
expectedOutput:="42").
VerifyIL("A.Main",
<![CDATA[
......@@ -64,7 +64,7 @@ End Module
IL_0001: ldc.i4.3
IL_0002: newobj "Integer(*,*)..ctor"
IL_0007: dup
IL_0008: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=24 <PrivateImplementationDetails>.$$method0x6000001-A4B74E064E285570B3499538C5B205C3D0972FDF"
IL_0008: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=24 <PrivateImplementationDetails><MODULE>.A4B74E064E285570B3499538C5B205C3D0972FDF"
IL_000d: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0012: dup
IL_0013: ldc.i4.1
......
src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenSelectCase.vb
浏览文件 @ 38aa68de
......@@ -3244,7 +3244,7 @@ End Module
IL_0000: ldarg.0
IL_0001: stloc.0
IL_0002: ldloc.0
IL_0003: call "Function $$method0x6000001-ComputeStringHash(String) As UInteger"
IL_0003: call "Function ComputeStringHash(String) As UInteger"
IL_0008: stloc.1
IL_0009: ldloc.1
IL_000a: ldc.i4 0x330ca589
......@@ -3673,7 +3673,7 @@ Equal to A]]>).VerifyIL("M1.Test", <![CDATA[
IL_0000: ldarg.0
IL_0001: stloc.0
IL_0002: ldloc.0
IL_0003: call "Function $$method0x6000001-ComputeStringHash(String) As UInteger"
IL_0003: call "Function ComputeStringHash(String) As UInteger"
IL_0008: stloc.1
IL_0009: ldloc.1
IL_000a: ldc.i4 0x340ca71c
......@@ -4017,7 +4017,7 @@ End Module
IL_0000: ldarg.0
IL_0001: stloc.0
IL_0002: ldloc.0
IL_0003: call "Function $$method0x6000001-ComputeStringHash(String) As UInteger"
IL_0003: call "Function ComputeStringHash(String) As UInteger"
IL_0008: stloc.1
IL_0009: ldloc.1
IL_000a: ldc.i4 0x330ca589
......@@ -4373,7 +4373,7 @@ End Module
IL_0000: ldarg.0
IL_0001: stloc.0
IL_0002: ldloc.0
IL_0003: call "Function $$method0x6000001-ComputeStringHash(String) As UInteger"
IL_0003: call "Function ComputeStringHash(String) As UInteger"
IL_0008: stloc.1
IL_0009: ldloc.1
IL_000a: ldc.i4 0x330ca589
......@@ -4729,7 +4729,7 @@ End Module
IL_0000: ldstr ""
IL_0005: stloc.0
IL_0006: ldloc.0
IL_0007: call "Function $$method0x6000001-ComputeStringHash(String) As UInteger"
IL_0007: call "Function ComputeStringHash(String) As UInteger"
IL_000c: stloc.1
IL_000d: ldloc.1
IL_000e: ldc.i4 0x330ca589
......
src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTests.vb
浏览文件 @ 38aa68de
......@@ -4835,7 +4835,7 @@ Module M1
End Sub
End Module
</file>
</compilation>,
</compilation>, options:=TestOptions.ReleaseExe.WithModuleName("MODULE"),
expectedOutput:="3b").VerifyIL("M1.Main",
<![CDATA[
{
......@@ -4845,7 +4845,7 @@ expectedOutput:="3b").VerifyIL("M1.Main",
IL_0000: ldc.i4.3
IL_0001: newarr "Integer"
IL_0006: dup
IL_0007: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E"
IL_0007: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E"
IL_000c: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0011: stloc.0
IL_0012: ldc.i4.2
......@@ -6787,7 +6787,7 @@ Module M1
End Sub
End Module
</file>
</compilation>).
</compilation>, options:=TestOptions.ReleaseDll.WithModuleName("MODULE")).
VerifyIL("M1.M",
<![CDATA[
{
......@@ -6796,25 +6796,25 @@ End Module
IL_0000: ldc.i4.5
IL_0001: newarr "Byte"
IL_0006: dup
IL_0007: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=5 <PrivateImplementationDetails>.$$method0x6000001-9755240DD0C4C1AD226DEBD40C6D2EBD408250CB"
IL_0007: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=5 <PrivateImplementationDetails><MODULE>.9755240DD0C4C1AD226DEBD40C6D2EBD408250CB"
IL_000c: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0011: pop
IL_0012: ldc.i4.5
IL_0013: newarr "Double"
IL_0018: dup
IL_0019: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=40 <PrivateImplementationDetails>.$$method0x6000001-11F3436B917FFBA0FAB0FAD5563AF18FA24AC16A"
IL_0019: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=40 <PrivateImplementationDetails><MODULE>.11F3436B917FFBA0FAB0FAD5563AF18FA24AC16A"
IL_001e: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0023: pop
IL_0024: ldc.i4.5
IL_0025: newarr "Boolean"
IL_002a: dup
IL_002b: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=5 <PrivateImplementationDetails>.$$method0x6000001-4E724558F6B816715597A51663AD8F05247E2C4A"
IL_002b: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=5 <PrivateImplementationDetails><MODULE>.4E724558F6B816715597A51663AD8F05247E2C4A"
IL_0030: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0035: pop
IL_0036: ldc.i4.5
IL_0037: newarr "Char"
IL_003c: dup
IL_003d: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=10 <PrivateImplementationDetails>.$$method0x6000001-E313A2813013780396D58750DC5D62221C86F42F"
IL_003d: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=10 <PrivateImplementationDetails><MODULE>.E313A2813013780396D58750DC5D62221C86F42F"
IL_0042: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0047: pop
IL_0048: ret
......@@ -6889,7 +6889,7 @@ Module M1
End Sub
End Module
</file>
</compilation>)).VerifyIL("M1.M",
</compilation>, options:=TestOptions.ReleaseDll.WithModuleName("MODULE"))).VerifyIL("M1.M",
<![CDATA[
{
// Code size 19 (0x13)
......@@ -6897,7 +6897,7 @@ End Module
IL_0000: ldc.i4.5
IL_0001: newarr "System.TypeCode"
IL_0006: dup
IL_0007: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-3191FF614021ADF3122AC274EA5B6097C21BEB81"
IL_0007: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.3191FF614021ADF3122AC274EA5B6097C21BEB81"
IL_000c: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0011: pop
IL_0012: ret
......@@ -10573,7 +10573,7 @@ Module Program
End Sub
End Module
</file>
</compilation>, expectedOutput:=<![CDATA[False
</compilation>, options:=TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput:=<![CDATA[False
True
System.Exception: Exception of type 'System.Exception' was thrown.
......@@ -10615,7 +10615,7 @@ True
IL_0040: ldc.i4.4
IL_0041: newarr "Boolean"
IL_0046: dup
IL_0047: ldtoken "Integer <PrivateImplementationDetails>.$$method0x6000001-35CCB1599F52363510686EF38B7DB5E7998DB108"
IL_0047: ldtoken "Integer <PrivateImplementationDetails><MODULE>.35CCB1599F52363510686EF38B7DB5E7998DB108"
IL_004c: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0051: ldc.i4.2
IL_0052: ldelem.u1
......@@ -11461,7 +11461,7 @@ Module Module1
End Module
</file>
</compilation>, expectedOutput:="12").
</compilation>, options:=TestOptions.ReleaseExe.WithModuleName("MODULE"), expectedOutput:="12").
VerifyIL("Module1.getTypes",
<![CDATA[
{
......@@ -11474,7 +11474,7 @@ End Module
IL_0000: ldc.i4.4
IL_0001: newarr "Integer"
IL_0006: dup
IL_0007: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=16 <PrivateImplementationDetails>.$$method0x6000001-1456763F890A84558F99AFA687C36B9037697848"
IL_0007: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=16 <PrivateImplementationDetails><MODULE>.1456763F890A84558F99AFA687C36B9037697848"
IL_000c: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_0011: stloc.0
IL_0012: ldloc.0
......
src/Compilers/VisualBasic/Test/Emit/CodeGen/WinRTCollectionTests.vb
浏览文件 @ 38aa68de
......@@ -4388,6 +4388,7 @@ End Class
Dim verifier = CompileAndVerify(source,
additionalRefs:=LegacyRefs,
emitOptions:=TestEmitters.RefEmitBug,
options:=TestOptions.ReleaseExe.WithModuleName("MODULE"),
verify:=False)
AssertNoErrorsOrWarnings(verifier)
verifier.VerifyIL("AllMembers.TestLINQ", <![CDATA[
......@@ -4430,7 +4431,7 @@ End Class
IL_005b: ldc.i4.5
IL_005c: newarr "Integer"
IL_0061: dup
IL_0062: ldtoken "<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-864782BF337E3DBC1A27023D5C0C065C80F17087"
IL_0062: ldtoken "<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.864782BF337E3DBC1A27023D5C0C065C80F17087"
IL_0067: call "Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)"
IL_006c: ldloc.0
IL_006d: ldftn "Function AllMembers._Closure$__5-0._Lambda$__0(Integer) As Boolean"
......
src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinueTests.vb
浏览文件 @ 38aa68de
......@@ -444,7 +444,7 @@ Class C
End Class
]]></file>
</compilation>
Dim compilation0 = CreateCompilationWithMscorlibAndVBRuntime(sources0, TestOptions.DebugDll)
Dim compilation0 = CreateCompilationWithMscorlibAndVBRuntime(sources0, TestOptions.DebugDll.WithModuleName("MODULE"))
Dim compilation1 = compilation0.WithSource(sources1)
Dim testData0 = New CompilationTestData()
......@@ -459,7 +459,7 @@ End Class
IL_0001: ldc.i4.3
IL_0002: newarr ""Integer""
IL_0007: dup
IL_0008: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails>.$$method0x6000001-E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_0008: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=12 <PrivateImplementationDetails><MODULE>.E429CCA3F703A39CC5954A6572FEC9086135B34E""
IL_000d: call ""Sub System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0012: stloc.0
IL_0013: ldloc.0
......@@ -543,7 +543,7 @@ Class C
End Class
]]></file>
</compilation>
Const ComputeStringHashName As String = "$$method0x6000001-ComputeStringHash"
Const ComputeStringHashName As String = "ComputeStringHash"
Dim compilation0 = CreateCompilationWithMscorlibAndVBRuntime(sources, TestOptions.DebugDll)
Dim compilation1 = compilation0.WithSource(sources)
......@@ -554,7 +554,7 @@ End Class
Dim generation0 = EmitBaseline.CreateInitialBaseline(ModuleMetadata.CreateFromImage(bytes0), methodData0.EncDebugInfoProvider)
' Should have generated call to ComputeStringHash and
' added the method to <PrivateImplementationDetails>.
' added the method to <PrivateImplementationDetails><MODULE>.
Dim actualIL0 = methodData0.GetMethodIL()
Assert.True(actualIL0.Contains(ComputeStringHashName))
......@@ -570,7 +570,7 @@ End Class
ImmutableArray.Create(edit))
' Should not have generated call to ComputeStringHash nor
' added the method to <PrivateImplementationDetails>.
' added the method to <PrivateImplementationDetails><MODULE>.
Dim actualIL1 = diff1.GetMethodIL("C.F")
Assert.False(actualIL1.Contains(ComputeStringHashName))
......
src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs
浏览文件 @ 38aa68de
......@@ -3371,7 +3371,7 @@ .maxstack 3
IL_0000: ldc.i4.5
IL_0001: newarr ""int""
IL_0006: dup
IL_0007: ldtoken ""<PrivateImplementationDetails>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails>.$$method0x6000001-1036C5F8EF306104BD582D73E555F4DAE8EECB24""
IL_0007: ldtoken ""<PrivateImplementationDetails><MODULE>.__StaticArrayInitTypeSize=20 <PrivateImplementationDetails><MODULE>.1036C5F8EF306104BD582D73E555F4DAE8EECB24""
IL_000c: call ""void System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray(System.Array, System.RuntimeFieldHandle)""
IL_0011: ret
}");
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或