diff options
Diffstat (limited to 'src/ILCompiler.TypeSystem/src')
-rw-r--r-- | src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj | 36 | ||||
-rw-r--r-- | src/ILCompiler.TypeSystem/src/Utilities/UniqueTypeNameFormatter.cs | 2 |
2 files changed, 34 insertions, 4 deletions
diff --git a/src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj b/src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj index c9b2ef2bf..ec7b134e6 100644 --- a/src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj +++ b/src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj @@ -82,6 +82,9 @@ <Compile Include="..\..\Common\src\TypeSystem\CodeGen\TargetDetails.CodeGen.cs"> <Link>TypeSystem\CodeGen\TargetDetails.CodeGen.cs</Link> </Compile> + <Compile Include="..\..\Common\src\TypeSystem\CodeGen\TypeDesc.CodeGen.cs"> + <Link>TypeSystem\CodeGen\TypeDesc.CodeGen.cs</Link> + </Compile> <Compile Include="..\..\Common\src\TypeSystem\Common\AlignmentHelper.cs"> <Link>Utilities\AlignmentHelper.cs</Link> </Compile> @@ -355,12 +358,15 @@ <Compile Include="..\..\Common\src\TypeSystem\IL\DelegateInfo.cs"> <Link>IL\DelegateInfo.cs</Link> </Compile> - <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\DelegateMarshallingMethodThunk.Sorting.cs"> - <Link>IL\Stubs\DelegateMarshallingMethodThunk.Sorting.cs</Link> - </Compile> <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\DelegateThunks.Sorting.cs"> <Link>IL\Stubs\DelegateThunks.Sorting.cs</Link> </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\DynamicInvokeMethodThunk.cs"> + <Link>IL\Stubs\DynamicInvokeMethodThunk.cs</Link> + </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\DynamicInvokeMethodThunk.Sorting.cs"> + <Link>IL\Stubs\DynamicInvokeMethodThunk.Sorting.cs</Link> + </Compile> <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\EnumThunks.cs"> <Link>IL\Stubs\EnumThunks.cs</Link> </Compile> @@ -388,6 +394,15 @@ <Compile Include="..\..\Common\src\TypeSystem\IL\TypeSystemContext.DelegateInfo.cs"> <Link>IL\TypeSystemContext.DelegateInfo.cs</Link> </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\TypeSystemContext.DynamicInvoke.cs"> + <Link>IL\TypeSystemContext.DynamicInvoke.cs</Link> + </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\TypeSystemContext.GeneratedAssembly.cs"> + <Link>IL\TypeSystemContext.GeneratedAssembly.cs</Link> + </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\TypeSystemContext.GeneratedAssembly.Sorting.cs"> + <Link>IL\TypeSystemContext.GeneratedAssembly.Sorting.cs</Link> + </Compile> <Compile Include="..\..\Common\src\TypeSystem\IL\EcmaMethodIL.cs"> <Link>IL\EcmaMethodIL.cs</Link> </Compile> @@ -457,12 +472,24 @@ <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\DebuggerSteppingHelpers.cs"> <Link>IL\Stubs\DebuggerSteppingHelpers.cs</Link> </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\CalliMarshallingMethodThunk.cs"> + <Link>IL\Stubs\CalliMarshallingMethodThunk.cs</Link> + </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\CalliMarshallingMethodThunk.Mangling.cs"> + <Link>IL\Stubs\CalliMarshallingMethodThunk.Mangling.cs</Link> + </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\CalliMarshallingMethodThunk.Sorting.cs"> + <Link>IL\Stubs\CalliMarshallingMethodThunk.Sorting.cs</Link> + </Compile> <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\DelegateMarshallingMethodThunk.cs"> <Link>IL\Stubs\DelegateMarshallingMethodThunk.cs</Link> </Compile> <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\DelegateMarshallingMethodThunk.Mangling.cs"> <Link>IL\Stubs\DelegateMarshallingMethodThunk.Mangling.cs</Link> </Compile> + <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\DelegateMarshallingMethodThunk.Sorting.cs"> + <Link>IL\Stubs\DelegateMarshallingMethodThunk.Sorting.cs</Link> + </Compile> <Compile Include="..\..\Common\src\TypeSystem\IL\Stubs\ForwardDelegateCreationThunk.cs"> <Link>IL\Stubs\ForwardDelegateCreationThunk.cs</Link> </Compile> @@ -544,6 +571,9 @@ <Compile Include="..\..\Common\src\TypeSystem\Mangling\IPrefixMangledType.cs"> <Link>TypeSystem\Mangling\IPrefixMangledType.cs</Link> </Compile> + <Compile Include="..\..\Common\src\TypeSystem\Mangling\IPrefixMangledSignature.cs"> + <Link>TypeSystem\Mangling\IPrefixMangledSignature.cs</Link> + </Compile> <Compile Include="..\..\Common\src\System\Collections\Generic\ArrayBuilder.cs"> <Link>Utilities\ArrayBuilder.cs</Link> </Compile> diff --git a/src/ILCompiler.TypeSystem/src/Utilities/UniqueTypeNameFormatter.cs b/src/ILCompiler.TypeSystem/src/Utilities/UniqueTypeNameFormatter.cs index 62d4cc411..5da415a46 100644 --- a/src/ILCompiler.TypeSystem/src/Utilities/UniqueTypeNameFormatter.cs +++ b/src/ILCompiler.TypeSystem/src/Utilities/UniqueTypeNameFormatter.cs @@ -120,7 +120,7 @@ namespace Internal.TypeSystem protected override void AppendNameForNestedType(StringBuilder sb, DefType nestedType, DefType containingType) { - AppendNameForNamespaceType(sb, containingType); + AppendName(sb, containingType); sb.Append('+'); |