diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-10-26 04:40:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-26 04:40:33 +0300 |
| commit | 5d129390f606b362734ed68b6f61a2cdee41d565 (patch) | |
| tree | 3444285a3637cc4b5b9e1575278244c2b85b7b59 /src/ILCompiler.Compiler | |
| parent | 249b186f33320f2edb4e6b027ba7b1ea10ac3836 (diff) | |
| parent | 31923974c1c1dae2e37ea684ae626f7b592d31e2 (diff) | |
Merge pull request #4805 from dotnet/nmirror
Merge nmirror to master
Diffstat (limited to 'src/ILCompiler.Compiler')
| -rw-r--r-- | src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.WindowsDebugData.cs | 5 | ||||
| -rw-r--r-- | src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.WindowsDebugData.cs b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.WindowsDebugData.cs index 19bdb1c94..75af21b3d 100644 --- a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.WindowsDebugData.cs +++ b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.WindowsDebugData.cs @@ -49,15 +49,14 @@ namespace ILCompiler.DependencyAnalysis _debugVirtualMethodInfoSection = new WindowsDebugMethodInfoSection(mergedAssemblyRecords); } - bool is64Bit = _nodeFactory.Target.PointerSize == 8 ? true : false; if (nonSectionBasedDebugInfoWriter != null) { - _userDefinedTypeDescriptor = new UserDefinedTypeDescriptor(nonSectionBasedDebugInfoWriter, is64Bit, _nodeFactory.Target.Abi); + _userDefinedTypeDescriptor = new UserDefinedTypeDescriptor(nonSectionBasedDebugInfoWriter, _nodeFactory); } else { _debugTypeRecordsSection = new WindowsDebugTypeRecordsSection(new DebugInfoWriter(), _nodeFactory); - _userDefinedTypeDescriptor = new UserDefinedTypeDescriptor(_debugTypeRecordsSection, is64Bit, _nodeFactory.Target.Abi); + _userDefinedTypeDescriptor = new UserDefinedTypeDescriptor(_debugTypeRecordsSection, _nodeFactory); } graph.AddRoot(_debugNeedTypeIndicesStore, "Debug Force All EETypes to have type indices"); diff --git a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs index 0899f2fbb..dde97273e 100644 --- a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs +++ b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs @@ -798,7 +798,7 @@ namespace ILCompiler.DependencyAnalysis } _nodeFactory = factory; _targetPlatform = _nodeFactory.Target; - _userDefinedTypeDescriptor = new UserDefinedTypeDescriptor(this, _targetPlatform.PointerSize == 8, factory.Target.Abi); + _userDefinedTypeDescriptor = new UserDefinedTypeDescriptor(this, factory); } public void Dispose() |