diff options
| author | Michal Strehovský <michals@microsoft.com> | 2018-06-17 10:50:25 +0300 |
|---|---|---|
| committer | Michal Strehovský <michals@microsoft.com> | 2018-06-17 10:50:25 +0300 |
| commit | 75b6df17098d438ee16bd2f17e21cd7ac1589116 (patch) | |
| tree | 36795814747af85a82dd1b41c7df68f0c0c77b46 /src/ILCompiler.Compiler | |
| parent | 03c1c6b90c026d90fbdc06191702d0a942a11338 (diff) | |
Fix CoreRT break in thread static name mangling
Diffstat (limited to 'src/ILCompiler.Compiler')
| -rw-r--r-- | src/ILCompiler.Compiler/src/Compiler/WindowsNodeMangler.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ILCompiler.Compiler/src/Compiler/WindowsNodeMangler.cs b/src/ILCompiler.Compiler/src/Compiler/WindowsNodeMangler.cs index 186d31ac5..0c3d3163a 100644 --- a/src/ILCompiler.Compiler/src/Compiler/WindowsNodeMangler.cs +++ b/src/ILCompiler.Compiler/src/Compiler/WindowsNodeMangler.cs @@ -47,7 +47,10 @@ namespace ILCompiler public sealed override string ThreadStatics(TypeDesc type) { - return NameMangler.GetMangledTypeName(type) + "::" + ThreadStaticMemberName; + if (type.Context.Target.Abi == TargetAbi.ProjectN) + return NameMangler.GetMangledTypeName(type) + "::" + ThreadStaticMemberName; + else + return NameMangler.CompilationUnitPrefix + NameMangler.GetMangledTypeName(type) + "::" + ThreadStaticMemberName; } public sealed override string TypeGenericDictionary(TypeDesc type) |