diff options
| author | Simon Nattress <nattress@gmail.com> | 2018-09-04 23:28:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 23:28:50 +0300 |
| commit | 3577e093cea7008919bbac4ad32bee62a9589612 (patch) | |
| tree | 36c9a966bdf42516b30f8ec5e64e61ee9b4e1220 | |
| parent | bf7be269ceb350784c0366b5eabe578ddcbe8932 (diff) | |
| parent | 712ff6fa57f931df00f58128578183f9acddd7b1 (diff) | |
Merge pull request #6293 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/ILCompiler.Compiler/src/Compiler/CompilerTypeSystemContext.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ILCompiler.Compiler/src/Compiler/CompilerTypeSystemContext.cs b/src/ILCompiler.Compiler/src/Compiler/CompilerTypeSystemContext.cs index e522e2144..6f4710561 100644 --- a/src/ILCompiler.Compiler/src/Compiler/CompilerTypeSystemContext.cs +++ b/src/ILCompiler.Compiler/src/Compiler/CompilerTypeSystemContext.cs @@ -424,6 +424,9 @@ namespace ILCompiler { Debug.Assert(field.IsStatic); + if (field.IsThreadStatic) + return true; + TypeDesc fieldType = field.FieldType; if (fieldType.IsValueType) return ((DefType)fieldType).ContainsGCPointers; |