This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge changes from TFS#4487

Merged
jkotas merged 1 commit into from
Sep 12, 2017
Merged

Merge changes from TFS #4487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithCodeInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,12 @@ namespace ILCompiler.DependencyAnalysis
[Flags]
public enum FrameInfoFlags
{
Handler = 0x01,
Filter = 0x02,
Handler = 0x01,
Filter = 0x02,

HasEHInfo = 0x04,
ReversePInvoke = 0x08,
HasEHInfo = 0x04,
ReversePInvoke = 0x08,
HasAssociatedData = 0x10,
}

public struct FrameInfo
Expand DownExpand Up@@ -48,5 +49,7 @@ ObjectNode.ObjectData EHInfo
{
get;
}

ISymbolNode GetAssociatedDataNode(NodeFactory factory);
}
}
17 changes: 17 additions & 0 deletions src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ISpecialUnboxThunkNode.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Internal.TypeSystem;

namespace ILCompiler.DependencyAnalysis
{
/// <summary>
/// A dependency analysis node that represents a special instantiating unboxing stub.
/// </summary>
public interface ISpecialUnboxThunkNode : IMethodNode
{
bool IsSpecialUnboxingThunk { get; }
ISymbolNode GetUnboxingThunkTarget(NodeFactory factory);
}
}
83 changes: 83 additions & 0 deletions src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Diagnostics;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

namespace ILCompiler.DependencyAnalysis
{
[Flags]
public enum AssociatedDataFlags : byte
{
None = 0,
HasUnboxingStubTarget = 1,
}

/// <summary>
/// This node contains any custom data that we'd like to associated with a method. The unwind info of the method
/// will have a reloc to this custom data if it exists. Not all methods need custom data to be emitted.
/// This custom data excludes gcinfo and ehinfo (they are written by ObjectWriter during obj file emission).
/// </summary>
public class MethodAssociatedDataNode : ObjectNode, ISymbolDefinitionNode
{
private IMethodNode _methodNode;

public MethodAssociatedDataNode(IMethodNode methodNode)
{
Debug.Assert(!methodNode.Method.IsAbstract);
Debug.Assert(methodNode.Method.GetCanonMethodTarget(CanonicalFormKind.Specific) == methodNode.Method);
_methodNode = methodNode;
}

protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler);

public override ObjectNodeSection Section => ObjectNodeSection.ReadOnlyDataSection;
public override bool StaticDependenciesAreComputed => true;
public int Offset => 0;
public override bool IsShareable => _methodNode.Method is InstantiatedMethod || EETypeNode.IsTypeNodeShareable(_methodNode.Method.OwningType);

public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
{
sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method));
}

public static bool MethodHasAssociatedData(NodeFactory factory, IMethodNode methodNode)
{
// Instantiating unboxing stubs. We need to store their non-unboxing target pointer (looked up by runtime)
ISpecialUnboxThunkNode unboxThunk = methodNode as ISpecialUnboxThunkNode;
if(unboxThunk != null && unboxThunk.IsSpecialUnboxingThunk)
return true;

return false;
}

public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
{
Debug.Assert(MethodHasAssociatedData(factory, _methodNode));

ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
objData.RequireInitialAlignment(1);
objData.AddSymbol(this);

AssociatedDataFlags flags = AssociatedDataFlags.None;

var flagsReservation = objData.ReserveByte();

ISpecialUnboxThunkNode unboxThunkNode = _methodNode as ISpecialUnboxThunkNode;
if (unboxThunkNode != null && unboxThunkNode.IsSpecialUnboxingThunk)
{
flags |= AssociatedDataFlags.HasUnboxingStubTarget;
objData.EmitPointerReloc(unboxThunkNode.GetUnboxingThunkTarget(factory));
}

objData.EmitByte(flagsReservation, (byte)flags);

return objData.ToObjectData();
}
}
}
26 changes: 25 additions & 1 deletion src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodCodeNode.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

namespace ILCompiler.DependencyAnalysis
{
public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode
public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode, ISpecialUnboxThunkNode
{
public static readonly ObjectNodeSection StartSection = new ObjectNodeSection(".managedcode$A", SectionType.Executable);
public static readonly ObjectNodeSection WindowsContentSection = new ObjectNodeSection(".managedcode$I", SectionType.Executable);
Expand DownExpand Up@@ -82,6 +82,12 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
}
}

if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
{
dependencies = dependencies ?? new DependencyList();
dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
}

CodeBasedDependencyAlgorithm.AddDependenciesDueToMethodCodePresence(ref dependencies, factory, _method);

return dependencies;
Expand All@@ -92,10 +98,28 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
return _methodCode;
}

public bool IsSpecialUnboxingThunk => ((CompilerTypeSystemContext)Method.Context).IsSpecialUnboxingThunk(_method);

public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
{
Debug.Assert(IsSpecialUnboxingThunk);

MethodDesc nonUnboxingMethod = ((CompilerTypeSystemContext)Method.Context).GetTargetOfSpecialUnboxingThunk(_method);
return factory.MethodEntrypoint(nonUnboxingMethod, false);
}

public FrameInfo[] FrameInfos => _frameInfos;
public byte[] GCInfo => _gcInfo;
public ObjectData EHInfo => _ehInfo;

public ISymbolNode GetAssociatedDataNode(NodeFactory factory)
{
if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
return factory.MethodAssociatedData(this);

return null;
}

public void InitializeFrameInfos(FrameInfo[] frameInfos)
{
Debug.Assert(_frameInfos == null);
Expand Down
11 changes: 11 additions & 0 deletions src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,6 +296,11 @@ private void CreateNodeCaches()

_unboxingStubs = new NodeCache<MethodDesc, IMethodNode>(CreateUnboxingStubNode);

_methodAssociatedData = new NodeCache<IMethodNode, MethodAssociatedDataNode>(methodNode =>
{
return new MethodAssociatedDataNode(methodNode);
});

_fatFunctionPointers = new NodeCache<MethodKey, FatFunctionPointerNode>(method =>
{
return new FatFunctionPointerNode(method.Method, method.IsUnboxingStub);
Expand DownExpand Up@@ -707,6 +712,7 @@ public IMethodNode StringAllocator(MethodDesc stringConstructor)

private NodeCache<MethodDesc, IMethodNode> _methodEntrypoints;
private NodeCache<MethodDesc, IMethodNode> _unboxingStubs;
private NodeCache<IMethodNode, MethodAssociatedDataNode> _methodAssociatedData;

public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false)
{
Expand All@@ -718,6 +724,11 @@ public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false
return _methodEntrypoints.GetOrAdd(method);
}

public MethodAssociatedDataNode MethodAssociatedData(IMethodNode methodNode)
{
return _methodAssociatedData.GetOrAdd(methodNode);
}

private NodeCache<MethodKey, FatFunctionPointerNode> _fatFunctionPointers;

public IMethodNode FatFunctionPointer(MethodDesc method, bool isUnboxingStub = false)
Expand Down
30 changes: 29 additions & 1 deletion src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NonExternMethodSymbolNode.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@ namespace ILCompiler.DependencyAnalysis
/// in the DependencyAnalysis infrastructure during compilation that is compiled
/// in the current compilation process
/// </summary>
public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols
public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols, ISpecialUnboxThunkNode
{
private MethodDesc _method;
private bool _isUnboxing;
private List<DependencyListEntry> _compilationDiscoveredDependencies;
ISymbolNode[] _funcletSymbols = Array.Empty<ISymbolNode>();
bool _dependenciesQueried;
Expand All@@ -29,6 +30,7 @@ public NonExternMethodSymbolNode(NodeFactory factory, MethodDesc method, bool is
: base(isUnboxing ? UnboxingStubNode.GetMangledName(factory.NameMangler, method) :
factory.NameMangler.GetMangledMethodName(method))
{
_isUnboxing = isUnboxing;
_method = method;
}

Expand All@@ -42,6 +44,26 @@ public MethodDesc Method
}
}

public bool IsSpecialUnboxingThunk
{
get
{
if (_isUnboxing)
{
if (!_method.HasInstantiation && _method.OwningType.IsValueType && !_method.Signature.IsStatic)
return _method.IsCanonicalMethod(CanonicalFormKind.Any);
}

return false;
}
}
public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
{
Debug.Assert(IsSpecialUnboxingThunk);

return factory.MethodEntrypoint(_method.GetCanonMethodTarget(CanonicalFormKind.Specific), false);
}

public bool HasCompiledBody => _hasCompiledBody;
public void SetHasCompiledBody()
{
Expand DownExpand Up@@ -99,6 +121,12 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
dependencies.AddRange(_compilationDiscoveredDependencies);
}

if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
{
dependencies = dependencies ?? new DependencyList();
dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
}

return dependencies;
}

Expand Down
35 changes: 27 additions & 8 deletions src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -432,11 +432,15 @@ public void PublishUnwindInfo(ObjectNode node)
FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
if (frameInfos == null)
{
// Data should only be present if the method has unwind info
Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

return;
}

byte[] gcInfo = nodeWithCodeInfo.GCInfo;
ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

for (int i = 0; i < frameInfos.Length; i++)
{
Expand All@@ -458,15 +462,19 @@ public void PublishUnwindInfo(ObjectNode node)
EmitSymbolDef(blobSymbolName);

FrameInfoFlags flags = frameInfo.Flags;
if (ehInfo != null)
{
flags |= FrameInfoFlags.HasEHInfo;
}
flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

EmitBlob(blob);

EmitIntValue((byte)flags, 1);

if (associatedDataNode != null)
{
EmitSymbolRef(_sb.Clear().Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_ABSOLUTE);
associatedDataNode = null;
}

if (ehInfo != null)
{
EmitSymbolRef(_sb.Clear().Append(_nodeFactory.NameMangler.CompilationUnitPrefix).Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_ABSOLUTE);
Expand DownExpand Up@@ -512,11 +520,15 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
if (frameInfos == null)
{
// Data should only be present if the method has unwind info
Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

return;
}

byte[] gcInfo = nodeWithCodeInfo.GCInfo;
ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

for (int i = 0; i < frameInfos.Length; i++)
{
Expand All@@ -539,10 +551,9 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
EmitSymbolDef(blobSymbolName);

FrameInfoFlags flags = frameInfo.Flags;
if (ehInfo != null)
{
flags |= FrameInfoFlags.HasEHInfo;
}
flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

EmitIntValue((byte)flags, 1);

if (i != 0)
Expand All@@ -553,6 +564,14 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
EmitIntValue((ulong)(start - frameInfos[0].StartOffset), 4);
}

if (associatedDataNode != null)
{
_sb.Clear();
AppendExternCPrefix(_sb);
EmitSymbolRef(_sb.Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_RELPTR32);
associatedDataNode = null;
}

if (ehInfo != null)
{
EmitSymbolRef(_sb.Clear().Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_RELPTR32);
Expand Down
6 changes: 4 additions & 2 deletions src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@
<Compile Include="Compiler\DependencyAnalysis\INodeWithRuntimeDeterminedDependencies.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedEETypeSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedStaticsNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\PInvokeMethodFixupNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\PInvokeModuleFixupNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ResourceDataNode.cs" />
Expand All@@ -208,9 +208,11 @@
<Compile Include="Compiler\DependencyAnalysis\EmbeddedPointerIndirectionNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\IMethodNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ISpecialUnboxThunkNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\InterfaceDispatchCellNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\MetadataNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\MethodCodeNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\MethodAssociatedDataNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ArrayOfEmbeddedPointersNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ObjectNodeSection.cs" />
<Compile Include="Compiler\DependencyAnalysis\ReadyToRunHeaderNode.cs" />
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge changes from TFS#4487
 Merged

jkotas
merged 1 commit into

from

Sep 12, 2017
 Merged


Merge changes from TFS
#4487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 7 additions & 4 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithCodeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,12 @@ namespace ILCompiler.DependencyAnalysis
 [Flags]
 public enum FrameInfoFlags
 {
 Handler = 0x01,
 Filter = 0x02,
 Handler = 0x01,
 Filter = 0x02,

 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasAssociatedData = 0x10,
 }

 public struct FrameInfo
Expand DownExpand Up@@ -48,5 +49,7 @@ ObjectNode.ObjectData EHInfo
 {
 get;
 }

 ISymbolNode GetAssociatedDataNode(NodeFactory factory);
 }
}

17 changes: 17 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ISpecialUnboxThunkNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Internal.TypeSystem;

namespace ILCompiler.DependencyAnalysis
{
 /// <summary>
 /// A dependency analysis node that represents a special instantiating unboxing stub.
 /// </summary>
 public interface ISpecialUnboxThunkNode : IMethodNode
 {
 bool IsSpecialUnboxingThunk { get; }
 ISymbolNode GetUnboxingThunkTarget(NodeFactory factory);
 }
}

83 changes: 83 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Diagnostics;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

namespace ILCompiler.DependencyAnalysis
{
 [Flags]
 public enum AssociatedDataFlags : byte
 {
 None = 0,
 HasUnboxingStubTarget = 1,
 }

 /// <summary>
 /// This node contains any custom data that we'd like to associated with a method. The unwind info of the method
 /// will have a reloc to this custom data if it exists. Not all methods need custom data to be emitted.
 /// This custom data excludes gcinfo and ehinfo (they are written by ObjectWriter during obj file emission).
 /// </summary>
 public class MethodAssociatedDataNode : ObjectNode, ISymbolDefinitionNode
 {
 private IMethodNode _methodNode;

 public MethodAssociatedDataNode(IMethodNode methodNode)
 {
 Debug.Assert(!methodNode.Method.IsAbstract);
 Debug.Assert(methodNode.Method.GetCanonMethodTarget(CanonicalFormKind.Specific) == methodNode.Method);
 _methodNode = methodNode;
 }

 protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler);

 public override ObjectNodeSection Section => ObjectNodeSection.ReadOnlyDataSection;
 public override bool StaticDependenciesAreComputed => true;
 public int Offset => 0;
 public override bool IsShareable => _methodNode.Method is InstantiatedMethod || EETypeNode.IsTypeNodeShareable(_methodNode.Method.OwningType);

 public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 {
 sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method));
 }

 public static bool MethodHasAssociatedData(NodeFactory factory, IMethodNode methodNode)
 {
 // Instantiating unboxing stubs. We need to store their non-unboxing target pointer (looked up by runtime)
 ISpecialUnboxThunkNode unboxThunk = methodNode as ISpecialUnboxThunkNode;
 if(unboxThunk != null && unboxThunk.IsSpecialUnboxingThunk)
 return true;

 return false;
 }

 public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 {
 Debug.Assert(MethodHasAssociatedData(factory, _methodNode));

 ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
 objData.RequireInitialAlignment(1);
 objData.AddSymbol(this);

 AssociatedDataFlags flags = AssociatedDataFlags.None;

 var flagsReservation = objData.ReserveByte();

 ISpecialUnboxThunkNode unboxThunkNode = _methodNode as ISpecialUnboxThunkNode;
 if (unboxThunkNode != null && unboxThunkNode.IsSpecialUnboxingThunk)
 {
 flags |= AssociatedDataFlags.HasUnboxingStubTarget;
 objData.EmitPointerReloc(unboxThunkNode.GetUnboxingThunkTarget(factory));
 }

 objData.EmitByte(flagsReservation, (byte)flags);

 return objData.ToObjectData();
 }
 }
}

26 changes: 25 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodCodeNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

namespace ILCompiler.DependencyAnalysis
{
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode, ISpecialUnboxThunkNode
 {
 public static readonly ObjectNodeSection StartSection = new ObjectNodeSection(".managedcode$A", SectionType.Executable);
 public static readonly ObjectNodeSection WindowsContentSection = new ObjectNodeSection(".managedcode$I", SectionType.Executable);
Expand DownExpand Up@@ -82,6 +82,12 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
 }
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 CodeBasedDependencyAlgorithm.AddDependenciesDueToMethodCodePresence(ref dependencies, factory, _method);

 return dependencies;
Expand All@@ -92,10 +98,28 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 return _methodCode;
 }

 public bool IsSpecialUnboxingThunk => ((CompilerTypeSystemContext)Method.Context).IsSpecialUnboxingThunk(_method);

 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 MethodDesc nonUnboxingMethod = ((CompilerTypeSystemContext)Method.Context).GetTargetOfSpecialUnboxingThunk(_method);
 return factory.MethodEntrypoint(nonUnboxingMethod, false);
 }

 public FrameInfo[] FrameInfos => _frameInfos;
 public byte[] GCInfo => _gcInfo;
 public ObjectData EHInfo => _ehInfo;

 public ISymbolNode GetAssociatedDataNode(NodeFactory factory)
 {
 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 return factory.MethodAssociatedData(this);

 return null;
 }

 public void InitializeFrameInfos(FrameInfo[] frameInfos)
 {
 Debug.Assert(_frameInfos == null);
Expand Down

11 changes: 11 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -296,6 +296,11 @@ private void CreateNodeCaches()

 _unboxingStubs = new NodeCache<MethodDesc, IMethodNode>(CreateUnboxingStubNode);

 _methodAssociatedData = new NodeCache<IMethodNode, MethodAssociatedDataNode>(methodNode =>
 {
 return new MethodAssociatedDataNode(methodNode);
 });

 _fatFunctionPointers = new NodeCache<MethodKey, FatFunctionPointerNode>(method =>
 {
 return new FatFunctionPointerNode(method.Method, method.IsUnboxingStub);
Expand DownExpand Up@@ -707,6 +712,7 @@ public IMethodNode StringAllocator(MethodDesc stringConstructor)

 private NodeCache<MethodDesc, IMethodNode> _methodEntrypoints;
 private NodeCache<MethodDesc, IMethodNode> _unboxingStubs;
 private NodeCache<IMethodNode, MethodAssociatedDataNode> _methodAssociatedData;

 public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false)
 {
Expand All@@ -718,6 +724,11 @@ public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false
 return _methodEntrypoints.GetOrAdd(method);
 }

 public MethodAssociatedDataNode MethodAssociatedData(IMethodNode methodNode)
 {
 return _methodAssociatedData.GetOrAdd(methodNode);
 }

 private NodeCache<MethodKey, FatFunctionPointerNode> _fatFunctionPointers;

 public IMethodNode FatFunctionPointer(MethodDesc method, bool isUnboxingStub = false)
Expand Down

30 changes: 29 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NonExternMethodSymbolNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@ namespace ILCompiler.DependencyAnalysis
 /// in the DependencyAnalysis infrastructure during compilation that is compiled 
 /// in the current compilation process
 /// </summary>
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols, ISpecialUnboxThunkNode
 {
 private MethodDesc _method;
 private bool _isUnboxing;
 private List<DependencyListEntry> _compilationDiscoveredDependencies;
 ISymbolNode[] _funcletSymbols = Array.Empty<ISymbolNode>();
 bool _dependenciesQueried;
Expand All@@ -29,6 +30,7 @@ public NonExternMethodSymbolNode(NodeFactory factory, MethodDesc method, bool is
 : base(isUnboxing ? UnboxingStubNode.GetMangledName(factory.NameMangler, method) :
 factory.NameMangler.GetMangledMethodName(method))
 {
 _isUnboxing = isUnboxing;
 _method = method;
 }

Expand All@@ -42,6 +44,26 @@ public MethodDesc Method
 }
 }

 public bool IsSpecialUnboxingThunk
 {
 get
 {
 if (_isUnboxing)
 {
 if (!_method.HasInstantiation && _method.OwningType.IsValueType && !_method.Signature.IsStatic)
 return _method.IsCanonicalMethod(CanonicalFormKind.Any);
 }

 return false;
 }
 }
 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 return factory.MethodEntrypoint(_method.GetCanonMethodTarget(CanonicalFormKind.Specific), false);
 }

 public bool HasCompiledBody => _hasCompiledBody;
 public void SetHasCompiledBody()
 {
Expand DownExpand Up@@ -99,6 +121,12 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
 dependencies.AddRange(_compilationDiscoveredDependencies);
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 return dependencies;
 }

Expand Down

35 changes: 27 additions & 8 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -432,11 +432,15 @@ public void PublishUnwindInfo(ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -458,15 +462,19 @@ public void PublishUnwindInfo(ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitBlob(blob);

 EmitIntValue((byte)flags, 1);

 if (associatedDataNode != null)
 {
 EmitSymbolRef(_sb.Clear().Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_ABSOLUTE);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append(_nodeFactory.NameMangler.CompilationUnitPrefix).Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_ABSOLUTE);
Expand DownExpand Up@@ -512,11 +520,15 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -539,10 +551,9 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitIntValue((byte)flags, 1);

 if (i != 0)
Expand All@@ -553,6 +564,14 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitIntValue((ulong)(start - frameInfos[0].StartOffset), 4);
 }

 if (associatedDataNode != null)
 {
 _sb.Clear();
 AppendExternCPrefix(_sb);
 EmitSymbolRef(_sb.Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_RELPTR32);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_RELPTR32);
Expand Down

6 changes: 4 additions & 2 deletions
src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@
 <Compile Include="Compiler\DependencyAnalysis\INodeWithRuntimeDeterminedDependencies.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedEETypeSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeMethodFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeModuleFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ResourceDataNode.cs" />
Expand All@@ -208,9 +208,11 @@
 <Compile Include="Compiler\DependencyAnalysis\EmbeddedPointerIndirectionNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\IMethodNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ISpecialUnboxThunkNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\InterfaceDispatchCellNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MetadataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodCodeNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodAssociatedDataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ArrayOfEmbeddedPointersNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ObjectNodeSection.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ReadyToRunHeaderNode.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge changes from TFS#4487
 Merged

jkotas
merged 1 commit into

from

Sep 12, 2017
 Merged


Merge changes from TFS
#4487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 7 additions & 4 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithCodeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,12 @@ namespace ILCompiler.DependencyAnalysis
 [Flags]
 public enum FrameInfoFlags
 {
 Handler = 0x01,
 Filter = 0x02,
 Handler = 0x01,
 Filter = 0x02,

 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasAssociatedData = 0x10,
 }

 public struct FrameInfo
Expand DownExpand Up@@ -48,5 +49,7 @@ ObjectNode.ObjectData EHInfo
 {
 get;
 }

 ISymbolNode GetAssociatedDataNode(NodeFactory factory);
 }
}

17 changes: 17 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ISpecialUnboxThunkNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Internal.TypeSystem;

namespace ILCompiler.DependencyAnalysis
{
 /// <summary>
 /// A dependency analysis node that represents a special instantiating unboxing stub.
 /// </summary>
 public interface ISpecialUnboxThunkNode : IMethodNode
 {
 bool IsSpecialUnboxingThunk { get; }
 ISymbolNode GetUnboxingThunkTarget(NodeFactory factory);
 }
}

83 changes: 83 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Diagnostics;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

namespace ILCompiler.DependencyAnalysis
{
 [Flags]
 public enum AssociatedDataFlags : byte
 {
 None = 0,
 HasUnboxingStubTarget = 1,
 }

 /// <summary>
 /// This node contains any custom data that we'd like to associated with a method. The unwind info of the method
 /// will have a reloc to this custom data if it exists. Not all methods need custom data to be emitted.
 /// This custom data excludes gcinfo and ehinfo (they are written by ObjectWriter during obj file emission).
 /// </summary>
 public class MethodAssociatedDataNode : ObjectNode, ISymbolDefinitionNode
 {
 private IMethodNode _methodNode;

 public MethodAssociatedDataNode(IMethodNode methodNode)
 {
 Debug.Assert(!methodNode.Method.IsAbstract);
 Debug.Assert(methodNode.Method.GetCanonMethodTarget(CanonicalFormKind.Specific) == methodNode.Method);
 _methodNode = methodNode;
 }

 protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler);

 public override ObjectNodeSection Section => ObjectNodeSection.ReadOnlyDataSection;
 public override bool StaticDependenciesAreComputed => true;
 public int Offset => 0;
 public override bool IsShareable => _methodNode.Method is InstantiatedMethod || EETypeNode.IsTypeNodeShareable(_methodNode.Method.OwningType);

 public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 {
 sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method));
 }

 public static bool MethodHasAssociatedData(NodeFactory factory, IMethodNode methodNode)
 {
 // Instantiating unboxing stubs. We need to store their non-unboxing target pointer (looked up by runtime)
 ISpecialUnboxThunkNode unboxThunk = methodNode as ISpecialUnboxThunkNode;
 if(unboxThunk != null && unboxThunk.IsSpecialUnboxingThunk)
 return true;

 return false;
 }

 public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 {
 Debug.Assert(MethodHasAssociatedData(factory, _methodNode));

 ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
 objData.RequireInitialAlignment(1);
 objData.AddSymbol(this);

 AssociatedDataFlags flags = AssociatedDataFlags.None;

 var flagsReservation = objData.ReserveByte();

 ISpecialUnboxThunkNode unboxThunkNode = _methodNode as ISpecialUnboxThunkNode;
 if (unboxThunkNode != null && unboxThunkNode.IsSpecialUnboxingThunk)
 {
 flags |= AssociatedDataFlags.HasUnboxingStubTarget;
 objData.EmitPointerReloc(unboxThunkNode.GetUnboxingThunkTarget(factory));
 }

 objData.EmitByte(flagsReservation, (byte)flags);

 return objData.ToObjectData();
 }
 }
}

26 changes: 25 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodCodeNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

namespace ILCompiler.DependencyAnalysis
{
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode, ISpecialUnboxThunkNode
 {
 public static readonly ObjectNodeSection StartSection = new ObjectNodeSection(".managedcode$A", SectionType.Executable);
 public static readonly ObjectNodeSection WindowsContentSection = new ObjectNodeSection(".managedcode$I", SectionType.Executable);
Expand DownExpand Up@@ -82,6 +82,12 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
 }
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 CodeBasedDependencyAlgorithm.AddDependenciesDueToMethodCodePresence(ref dependencies, factory, _method);

 return dependencies;
Expand All@@ -92,10 +98,28 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 return _methodCode;
 }

 public bool IsSpecialUnboxingThunk => ((CompilerTypeSystemContext)Method.Context).IsSpecialUnboxingThunk(_method);

 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 MethodDesc nonUnboxingMethod = ((CompilerTypeSystemContext)Method.Context).GetTargetOfSpecialUnboxingThunk(_method);
 return factory.MethodEntrypoint(nonUnboxingMethod, false);
 }

 public FrameInfo[] FrameInfos => _frameInfos;
 public byte[] GCInfo => _gcInfo;
 public ObjectData EHInfo => _ehInfo;

 public ISymbolNode GetAssociatedDataNode(NodeFactory factory)
 {
 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 return factory.MethodAssociatedData(this);

 return null;
 }

 public void InitializeFrameInfos(FrameInfo[] frameInfos)
 {
 Debug.Assert(_frameInfos == null);
Expand Down

11 changes: 11 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -296,6 +296,11 @@ private void CreateNodeCaches()

 _unboxingStubs = new NodeCache<MethodDesc, IMethodNode>(CreateUnboxingStubNode);

 _methodAssociatedData = new NodeCache<IMethodNode, MethodAssociatedDataNode>(methodNode =>
 {
 return new MethodAssociatedDataNode(methodNode);
 });

 _fatFunctionPointers = new NodeCache<MethodKey, FatFunctionPointerNode>(method =>
 {
 return new FatFunctionPointerNode(method.Method, method.IsUnboxingStub);
Expand DownExpand Up@@ -707,6 +712,7 @@ public IMethodNode StringAllocator(MethodDesc stringConstructor)

 private NodeCache<MethodDesc, IMethodNode> _methodEntrypoints;
 private NodeCache<MethodDesc, IMethodNode> _unboxingStubs;
 private NodeCache<IMethodNode, MethodAssociatedDataNode> _methodAssociatedData;

 public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false)
 {
Expand All@@ -718,6 +724,11 @@ public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false
 return _methodEntrypoints.GetOrAdd(method);
 }

 public MethodAssociatedDataNode MethodAssociatedData(IMethodNode methodNode)
 {
 return _methodAssociatedData.GetOrAdd(methodNode);
 }

 private NodeCache<MethodKey, FatFunctionPointerNode> _fatFunctionPointers;

 public IMethodNode FatFunctionPointer(MethodDesc method, bool isUnboxingStub = false)
Expand Down

30 changes: 29 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NonExternMethodSymbolNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@ namespace ILCompiler.DependencyAnalysis
 /// in the DependencyAnalysis infrastructure during compilation that is compiled 
 /// in the current compilation process
 /// </summary>
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols, ISpecialUnboxThunkNode
 {
 private MethodDesc _method;
 private bool _isUnboxing;
 private List<DependencyListEntry> _compilationDiscoveredDependencies;
 ISymbolNode[] _funcletSymbols = Array.Empty<ISymbolNode>();
 bool _dependenciesQueried;
Expand All@@ -29,6 +30,7 @@ public NonExternMethodSymbolNode(NodeFactory factory, MethodDesc method, bool is
 : base(isUnboxing ? UnboxingStubNode.GetMangledName(factory.NameMangler, method) :
 factory.NameMangler.GetMangledMethodName(method))
 {
 _isUnboxing = isUnboxing;
 _method = method;
 }

Expand All@@ -42,6 +44,26 @@ public MethodDesc Method
 }
 }

 public bool IsSpecialUnboxingThunk
 {
 get
 {
 if (_isUnboxing)
 {
 if (!_method.HasInstantiation && _method.OwningType.IsValueType && !_method.Signature.IsStatic)
 return _method.IsCanonicalMethod(CanonicalFormKind.Any);
 }

 return false;
 }
 }
 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 return factory.MethodEntrypoint(_method.GetCanonMethodTarget(CanonicalFormKind.Specific), false);
 }

 public bool HasCompiledBody => _hasCompiledBody;
 public void SetHasCompiledBody()
 {
Expand DownExpand Up@@ -99,6 +121,12 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
 dependencies.AddRange(_compilationDiscoveredDependencies);
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 return dependencies;
 }

Expand Down

35 changes: 27 additions & 8 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -432,11 +432,15 @@ public void PublishUnwindInfo(ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -458,15 +462,19 @@ public void PublishUnwindInfo(ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitBlob(blob);

 EmitIntValue((byte)flags, 1);

 if (associatedDataNode != null)
 {
 EmitSymbolRef(_sb.Clear().Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_ABSOLUTE);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append(_nodeFactory.NameMangler.CompilationUnitPrefix).Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_ABSOLUTE);
Expand DownExpand Up@@ -512,11 +520,15 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -539,10 +551,9 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitIntValue((byte)flags, 1);

 if (i != 0)
Expand All@@ -553,6 +564,14 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitIntValue((ulong)(start - frameInfos[0].StartOffset), 4);
 }

 if (associatedDataNode != null)
 {
 _sb.Clear();
 AppendExternCPrefix(_sb);
 EmitSymbolRef(_sb.Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_RELPTR32);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_RELPTR32);
Expand Down

6 changes: 4 additions & 2 deletions
src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@
 <Compile Include="Compiler\DependencyAnalysis\INodeWithRuntimeDeterminedDependencies.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedEETypeSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeMethodFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeModuleFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ResourceDataNode.cs" />
Expand All@@ -208,9 +208,11 @@
 <Compile Include="Compiler\DependencyAnalysis\EmbeddedPointerIndirectionNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\IMethodNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ISpecialUnboxThunkNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\InterfaceDispatchCellNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MetadataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodCodeNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodAssociatedDataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ArrayOfEmbeddedPointersNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ObjectNodeSection.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ReadyToRunHeaderNode.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge changes from TFS#4487
 Merged

jkotas
merged 1 commit into

from

Sep 12, 2017
 Merged


Merge changes from TFS
#4487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 7 additions & 4 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithCodeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,12 @@ namespace ILCompiler.DependencyAnalysis
 [Flags]
 public enum FrameInfoFlags
 {
 Handler = 0x01,
 Filter = 0x02,
 Handler = 0x01,
 Filter = 0x02,

 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasAssociatedData = 0x10,
 }

 public struct FrameInfo
Expand DownExpand Up@@ -48,5 +49,7 @@ ObjectNode.ObjectData EHInfo
 {
 get;
 }

 ISymbolNode GetAssociatedDataNode(NodeFactory factory);
 }
}

17 changes: 17 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ISpecialUnboxThunkNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Internal.TypeSystem;

namespace ILCompiler.DependencyAnalysis
{
 /// <summary>
 /// A dependency analysis node that represents a special instantiating unboxing stub.
 /// </summary>
 public interface ISpecialUnboxThunkNode : IMethodNode
 {
 bool IsSpecialUnboxingThunk { get; }
 ISymbolNode GetUnboxingThunkTarget(NodeFactory factory);
 }
}

83 changes: 83 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Diagnostics;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

namespace ILCompiler.DependencyAnalysis
{
 [Flags]
 public enum AssociatedDataFlags : byte
 {
 None = 0,
 HasUnboxingStubTarget = 1,
 }

 /// <summary>
 /// This node contains any custom data that we'd like to associated with a method. The unwind info of the method
 /// will have a reloc to this custom data if it exists. Not all methods need custom data to be emitted.
 /// This custom data excludes gcinfo and ehinfo (they are written by ObjectWriter during obj file emission).
 /// </summary>
 public class MethodAssociatedDataNode : ObjectNode, ISymbolDefinitionNode
 {
 private IMethodNode _methodNode;

 public MethodAssociatedDataNode(IMethodNode methodNode)
 {
 Debug.Assert(!methodNode.Method.IsAbstract);
 Debug.Assert(methodNode.Method.GetCanonMethodTarget(CanonicalFormKind.Specific) == methodNode.Method);
 _methodNode = methodNode;
 }

 protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler);

 public override ObjectNodeSection Section => ObjectNodeSection.ReadOnlyDataSection;
 public override bool StaticDependenciesAreComputed => true;
 public int Offset => 0;
 public override bool IsShareable => _methodNode.Method is InstantiatedMethod || EETypeNode.IsTypeNodeShareable(_methodNode.Method.OwningType);

 public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 {
 sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method));
 }

 public static bool MethodHasAssociatedData(NodeFactory factory, IMethodNode methodNode)
 {
 // Instantiating unboxing stubs. We need to store their non-unboxing target pointer (looked up by runtime)
 ISpecialUnboxThunkNode unboxThunk = methodNode as ISpecialUnboxThunkNode;
 if(unboxThunk != null && unboxThunk.IsSpecialUnboxingThunk)
 return true;

 return false;
 }

 public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 {
 Debug.Assert(MethodHasAssociatedData(factory, _methodNode));

 ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
 objData.RequireInitialAlignment(1);
 objData.AddSymbol(this);

 AssociatedDataFlags flags = AssociatedDataFlags.None;

 var flagsReservation = objData.ReserveByte();

 ISpecialUnboxThunkNode unboxThunkNode = _methodNode as ISpecialUnboxThunkNode;
 if (unboxThunkNode != null && unboxThunkNode.IsSpecialUnboxingThunk)
 {
 flags |= AssociatedDataFlags.HasUnboxingStubTarget;
 objData.EmitPointerReloc(unboxThunkNode.GetUnboxingThunkTarget(factory));
 }

 objData.EmitByte(flagsReservation, (byte)flags);

 return objData.ToObjectData();
 }
 }
}

26 changes: 25 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodCodeNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

namespace ILCompiler.DependencyAnalysis
{
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode, ISpecialUnboxThunkNode
 {
 public static readonly ObjectNodeSection StartSection = new ObjectNodeSection(".managedcode$A", SectionType.Executable);
 public static readonly ObjectNodeSection WindowsContentSection = new ObjectNodeSection(".managedcode$I", SectionType.Executable);
Expand DownExpand Up@@ -82,6 +82,12 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
 }
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 CodeBasedDependencyAlgorithm.AddDependenciesDueToMethodCodePresence(ref dependencies, factory, _method);

 return dependencies;
Expand All@@ -92,10 +98,28 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 return _methodCode;
 }

 public bool IsSpecialUnboxingThunk => ((CompilerTypeSystemContext)Method.Context).IsSpecialUnboxingThunk(_method);

 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 MethodDesc nonUnboxingMethod = ((CompilerTypeSystemContext)Method.Context).GetTargetOfSpecialUnboxingThunk(_method);
 return factory.MethodEntrypoint(nonUnboxingMethod, false);
 }

 public FrameInfo[] FrameInfos => _frameInfos;
 public byte[] GCInfo => _gcInfo;
 public ObjectData EHInfo => _ehInfo;

 public ISymbolNode GetAssociatedDataNode(NodeFactory factory)
 {
 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 return factory.MethodAssociatedData(this);

 return null;
 }

 public void InitializeFrameInfos(FrameInfo[] frameInfos)
 {
 Debug.Assert(_frameInfos == null);
Expand Down

11 changes: 11 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -296,6 +296,11 @@ private void CreateNodeCaches()

 _unboxingStubs = new NodeCache<MethodDesc, IMethodNode>(CreateUnboxingStubNode);

 _methodAssociatedData = new NodeCache<IMethodNode, MethodAssociatedDataNode>(methodNode =>
 {
 return new MethodAssociatedDataNode(methodNode);
 });

 _fatFunctionPointers = new NodeCache<MethodKey, FatFunctionPointerNode>(method =>
 {
 return new FatFunctionPointerNode(method.Method, method.IsUnboxingStub);
Expand DownExpand Up@@ -707,6 +712,7 @@ public IMethodNode StringAllocator(MethodDesc stringConstructor)

 private NodeCache<MethodDesc, IMethodNode> _methodEntrypoints;
 private NodeCache<MethodDesc, IMethodNode> _unboxingStubs;
 private NodeCache<IMethodNode, MethodAssociatedDataNode> _methodAssociatedData;

 public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false)
 {
Expand All@@ -718,6 +724,11 @@ public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false
 return _methodEntrypoints.GetOrAdd(method);
 }

 public MethodAssociatedDataNode MethodAssociatedData(IMethodNode methodNode)
 {
 return _methodAssociatedData.GetOrAdd(methodNode);
 }

 private NodeCache<MethodKey, FatFunctionPointerNode> _fatFunctionPointers;

 public IMethodNode FatFunctionPointer(MethodDesc method, bool isUnboxingStub = false)
Expand Down

30 changes: 29 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NonExternMethodSymbolNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@ namespace ILCompiler.DependencyAnalysis
 /// in the DependencyAnalysis infrastructure during compilation that is compiled 
 /// in the current compilation process
 /// </summary>
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols, ISpecialUnboxThunkNode
 {
 private MethodDesc _method;
 private bool _isUnboxing;
 private List<DependencyListEntry> _compilationDiscoveredDependencies;
 ISymbolNode[] _funcletSymbols = Array.Empty<ISymbolNode>();
 bool _dependenciesQueried;
Expand All@@ -29,6 +30,7 @@ public NonExternMethodSymbolNode(NodeFactory factory, MethodDesc method, bool is
 : base(isUnboxing ? UnboxingStubNode.GetMangledName(factory.NameMangler, method) :
 factory.NameMangler.GetMangledMethodName(method))
 {
 _isUnboxing = isUnboxing;
 _method = method;
 }

Expand All@@ -42,6 +44,26 @@ public MethodDesc Method
 }
 }

 public bool IsSpecialUnboxingThunk
 {
 get
 {
 if (_isUnboxing)
 {
 if (!_method.HasInstantiation && _method.OwningType.IsValueType && !_method.Signature.IsStatic)
 return _method.IsCanonicalMethod(CanonicalFormKind.Any);
 }

 return false;
 }
 }
 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 return factory.MethodEntrypoint(_method.GetCanonMethodTarget(CanonicalFormKind.Specific), false);
 }

 public bool HasCompiledBody => _hasCompiledBody;
 public void SetHasCompiledBody()
 {
Expand DownExpand Up@@ -99,6 +121,12 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
 dependencies.AddRange(_compilationDiscoveredDependencies);
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 return dependencies;
 }

Expand Down

35 changes: 27 additions & 8 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -432,11 +432,15 @@ public void PublishUnwindInfo(ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -458,15 +462,19 @@ public void PublishUnwindInfo(ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitBlob(blob);

 EmitIntValue((byte)flags, 1);

 if (associatedDataNode != null)
 {
 EmitSymbolRef(_sb.Clear().Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_ABSOLUTE);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append(_nodeFactory.NameMangler.CompilationUnitPrefix).Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_ABSOLUTE);
Expand DownExpand Up@@ -512,11 +520,15 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -539,10 +551,9 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitIntValue((byte)flags, 1);

 if (i != 0)
Expand All@@ -553,6 +564,14 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitIntValue((ulong)(start - frameInfos[0].StartOffset), 4);
 }

 if (associatedDataNode != null)
 {
 _sb.Clear();
 AppendExternCPrefix(_sb);
 EmitSymbolRef(_sb.Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_RELPTR32);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_RELPTR32);
Expand Down

6 changes: 4 additions & 2 deletions
src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@
 <Compile Include="Compiler\DependencyAnalysis\INodeWithRuntimeDeterminedDependencies.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedEETypeSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeMethodFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeModuleFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ResourceDataNode.cs" />
Expand All@@ -208,9 +208,11 @@
 <Compile Include="Compiler\DependencyAnalysis\EmbeddedPointerIndirectionNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\IMethodNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ISpecialUnboxThunkNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\InterfaceDispatchCellNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MetadataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodCodeNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodAssociatedDataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ArrayOfEmbeddedPointersNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ObjectNodeSection.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ReadyToRunHeaderNode.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge changes from TFS#4487
 Merged

jkotas
merged 1 commit into

from

Sep 12, 2017
 Merged


Merge changes from TFS
#4487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 7 additions & 4 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithCodeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,12 @@ namespace ILCompiler.DependencyAnalysis
 [Flags]
 public enum FrameInfoFlags
 {
 Handler = 0x01,
 Filter = 0x02,
 Handler = 0x01,
 Filter = 0x02,

 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasAssociatedData = 0x10,
 }

 public struct FrameInfo
Expand DownExpand Up@@ -48,5 +49,7 @@ ObjectNode.ObjectData EHInfo
 {
 get;
 }

 ISymbolNode GetAssociatedDataNode(NodeFactory factory);
 }
}

17 changes: 17 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ISpecialUnboxThunkNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Internal.TypeSystem;

namespace ILCompiler.DependencyAnalysis
{
 /// <summary>
 /// A dependency analysis node that represents a special instantiating unboxing stub.
 /// </summary>
 public interface ISpecialUnboxThunkNode : IMethodNode
 {
 bool IsSpecialUnboxingThunk { get; }
 ISymbolNode GetUnboxingThunkTarget(NodeFactory factory);
 }
}

83 changes: 83 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Diagnostics;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

namespace ILCompiler.DependencyAnalysis
{
 [Flags]
 public enum AssociatedDataFlags : byte
 {
 None = 0,
 HasUnboxingStubTarget = 1,
 }

 /// <summary>
 /// This node contains any custom data that we'd like to associated with a method. The unwind info of the method
 /// will have a reloc to this custom data if it exists. Not all methods need custom data to be emitted.
 /// This custom data excludes gcinfo and ehinfo (they are written by ObjectWriter during obj file emission).
 /// </summary>
 public class MethodAssociatedDataNode : ObjectNode, ISymbolDefinitionNode
 {
 private IMethodNode _methodNode;

 public MethodAssociatedDataNode(IMethodNode methodNode)
 {
 Debug.Assert(!methodNode.Method.IsAbstract);
 Debug.Assert(methodNode.Method.GetCanonMethodTarget(CanonicalFormKind.Specific) == methodNode.Method);
 _methodNode = methodNode;
 }

 protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler);

 public override ObjectNodeSection Section => ObjectNodeSection.ReadOnlyDataSection;
 public override bool StaticDependenciesAreComputed => true;
 public int Offset => 0;
 public override bool IsShareable => _methodNode.Method is InstantiatedMethod || EETypeNode.IsTypeNodeShareable(_methodNode.Method.OwningType);

 public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 {
 sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method));
 }

 public static bool MethodHasAssociatedData(NodeFactory factory, IMethodNode methodNode)
 {
 // Instantiating unboxing stubs. We need to store their non-unboxing target pointer (looked up by runtime)
 ISpecialUnboxThunkNode unboxThunk = methodNode as ISpecialUnboxThunkNode;
 if(unboxThunk != null && unboxThunk.IsSpecialUnboxingThunk)
 return true;

 return false;
 }

 public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 {
 Debug.Assert(MethodHasAssociatedData(factory, _methodNode));

 ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
 objData.RequireInitialAlignment(1);
 objData.AddSymbol(this);

 AssociatedDataFlags flags = AssociatedDataFlags.None;

 var flagsReservation = objData.ReserveByte();

 ISpecialUnboxThunkNode unboxThunkNode = _methodNode as ISpecialUnboxThunkNode;
 if (unboxThunkNode != null && unboxThunkNode.IsSpecialUnboxingThunk)
 {
 flags |= AssociatedDataFlags.HasUnboxingStubTarget;
 objData.EmitPointerReloc(unboxThunkNode.GetUnboxingThunkTarget(factory));
 }

 objData.EmitByte(flagsReservation, (byte)flags);

 return objData.ToObjectData();
 }
 }
}

26 changes: 25 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodCodeNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

namespace ILCompiler.DependencyAnalysis
{
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode, ISpecialUnboxThunkNode
 {
 public static readonly ObjectNodeSection StartSection = new ObjectNodeSection(".managedcode$A", SectionType.Executable);
 public static readonly ObjectNodeSection WindowsContentSection = new ObjectNodeSection(".managedcode$I", SectionType.Executable);
Expand DownExpand Up@@ -82,6 +82,12 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
 }
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 CodeBasedDependencyAlgorithm.AddDependenciesDueToMethodCodePresence(ref dependencies, factory, _method);

 return dependencies;
Expand All@@ -92,10 +98,28 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 return _methodCode;
 }

 public bool IsSpecialUnboxingThunk => ((CompilerTypeSystemContext)Method.Context).IsSpecialUnboxingThunk(_method);

 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 MethodDesc nonUnboxingMethod = ((CompilerTypeSystemContext)Method.Context).GetTargetOfSpecialUnboxingThunk(_method);
 return factory.MethodEntrypoint(nonUnboxingMethod, false);
 }

 public FrameInfo[] FrameInfos => _frameInfos;
 public byte[] GCInfo => _gcInfo;
 public ObjectData EHInfo => _ehInfo;

 public ISymbolNode GetAssociatedDataNode(NodeFactory factory)
 {
 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 return factory.MethodAssociatedData(this);

 return null;
 }

 public void InitializeFrameInfos(FrameInfo[] frameInfos)
 {
 Debug.Assert(_frameInfos == null);
Expand Down

11 changes: 11 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -296,6 +296,11 @@ private void CreateNodeCaches()

 _unboxingStubs = new NodeCache<MethodDesc, IMethodNode>(CreateUnboxingStubNode);

 _methodAssociatedData = new NodeCache<IMethodNode, MethodAssociatedDataNode>(methodNode =>
 {
 return new MethodAssociatedDataNode(methodNode);
 });

 _fatFunctionPointers = new NodeCache<MethodKey, FatFunctionPointerNode>(method =>
 {
 return new FatFunctionPointerNode(method.Method, method.IsUnboxingStub);
Expand DownExpand Up@@ -707,6 +712,7 @@ public IMethodNode StringAllocator(MethodDesc stringConstructor)

 private NodeCache<MethodDesc, IMethodNode> _methodEntrypoints;
 private NodeCache<MethodDesc, IMethodNode> _unboxingStubs;
 private NodeCache<IMethodNode, MethodAssociatedDataNode> _methodAssociatedData;

 public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false)
 {
Expand All@@ -718,6 +724,11 @@ public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false
 return _methodEntrypoints.GetOrAdd(method);
 }

 public MethodAssociatedDataNode MethodAssociatedData(IMethodNode methodNode)
 {
 return _methodAssociatedData.GetOrAdd(methodNode);
 }

 private NodeCache<MethodKey, FatFunctionPointerNode> _fatFunctionPointers;

 public IMethodNode FatFunctionPointer(MethodDesc method, bool isUnboxingStub = false)
Expand Down

30 changes: 29 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NonExternMethodSymbolNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@ namespace ILCompiler.DependencyAnalysis
 /// in the DependencyAnalysis infrastructure during compilation that is compiled 
 /// in the current compilation process
 /// </summary>
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols, ISpecialUnboxThunkNode
 {
 private MethodDesc _method;
 private bool _isUnboxing;
 private List<DependencyListEntry> _compilationDiscoveredDependencies;
 ISymbolNode[] _funcletSymbols = Array.Empty<ISymbolNode>();
 bool _dependenciesQueried;
Expand All@@ -29,6 +30,7 @@ public NonExternMethodSymbolNode(NodeFactory factory, MethodDesc method, bool is
 : base(isUnboxing ? UnboxingStubNode.GetMangledName(factory.NameMangler, method) :
 factory.NameMangler.GetMangledMethodName(method))
 {
 _isUnboxing = isUnboxing;
 _method = method;
 }

Expand All@@ -42,6 +44,26 @@ public MethodDesc Method
 }
 }

 public bool IsSpecialUnboxingThunk
 {
 get
 {
 if (_isUnboxing)
 {
 if (!_method.HasInstantiation && _method.OwningType.IsValueType && !_method.Signature.IsStatic)
 return _method.IsCanonicalMethod(CanonicalFormKind.Any);
 }

 return false;
 }
 }
 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 return factory.MethodEntrypoint(_method.GetCanonMethodTarget(CanonicalFormKind.Specific), false);
 }

 public bool HasCompiledBody => _hasCompiledBody;
 public void SetHasCompiledBody()
 {
Expand DownExpand Up@@ -99,6 +121,12 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
 dependencies.AddRange(_compilationDiscoveredDependencies);
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 return dependencies;
 }

Expand Down

35 changes: 27 additions & 8 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -432,11 +432,15 @@ public void PublishUnwindInfo(ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -458,15 +462,19 @@ public void PublishUnwindInfo(ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitBlob(blob);

 EmitIntValue((byte)flags, 1);

 if (associatedDataNode != null)
 {
 EmitSymbolRef(_sb.Clear().Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_ABSOLUTE);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append(_nodeFactory.NameMangler.CompilationUnitPrefix).Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_ABSOLUTE);
Expand DownExpand Up@@ -512,11 +520,15 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -539,10 +551,9 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitIntValue((byte)flags, 1);

 if (i != 0)
Expand All@@ -553,6 +564,14 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitIntValue((ulong)(start - frameInfos[0].StartOffset), 4);
 }

 if (associatedDataNode != null)
 {
 _sb.Clear();
 AppendExternCPrefix(_sb);
 EmitSymbolRef(_sb.Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_RELPTR32);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_RELPTR32);
Expand Down

6 changes: 4 additions & 2 deletions
src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@
 <Compile Include="Compiler\DependencyAnalysis\INodeWithRuntimeDeterminedDependencies.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedEETypeSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeMethodFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeModuleFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ResourceDataNode.cs" />
Expand All@@ -208,9 +208,11 @@
 <Compile Include="Compiler\DependencyAnalysis\EmbeddedPointerIndirectionNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\IMethodNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ISpecialUnboxThunkNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\InterfaceDispatchCellNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MetadataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodCodeNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodAssociatedDataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ArrayOfEmbeddedPointersNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ObjectNodeSection.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ReadyToRunHeaderNode.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge changes from TFS#4487
 Merged

jkotas
merged 1 commit into

from

Sep 12, 2017
 Merged


Merge changes from TFS
#4487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 7 additions & 4 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithCodeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,12 @@ namespace ILCompiler.DependencyAnalysis
 [Flags]
 public enum FrameInfoFlags
 {
 Handler = 0x01,
 Filter = 0x02,
 Handler = 0x01,
 Filter = 0x02,

 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasAssociatedData = 0x10,
 }

 public struct FrameInfo
Expand DownExpand Up@@ -48,5 +49,7 @@ ObjectNode.ObjectData EHInfo
 {
 get;
 }

 ISymbolNode GetAssociatedDataNode(NodeFactory factory);
 }
}

17 changes: 17 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ISpecialUnboxThunkNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Internal.TypeSystem;

namespace ILCompiler.DependencyAnalysis
{
 /// <summary>
 /// A dependency analysis node that represents a special instantiating unboxing stub.
 /// </summary>
 public interface ISpecialUnboxThunkNode : IMethodNode
 {
 bool IsSpecialUnboxingThunk { get; }
 ISymbolNode GetUnboxingThunkTarget(NodeFactory factory);
 }
}

83 changes: 83 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Diagnostics;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

namespace ILCompiler.DependencyAnalysis
{
 [Flags]
 public enum AssociatedDataFlags : byte
 {
 None = 0,
 HasUnboxingStubTarget = 1,
 }

 /// <summary>
 /// This node contains any custom data that we'd like to associated with a method. The unwind info of the method
 /// will have a reloc to this custom data if it exists. Not all methods need custom data to be emitted.
 /// This custom data excludes gcinfo and ehinfo (they are written by ObjectWriter during obj file emission).
 /// </summary>
 public class MethodAssociatedDataNode : ObjectNode, ISymbolDefinitionNode
 {
 private IMethodNode _methodNode;

 public MethodAssociatedDataNode(IMethodNode methodNode)
 {
 Debug.Assert(!methodNode.Method.IsAbstract);
 Debug.Assert(methodNode.Method.GetCanonMethodTarget(CanonicalFormKind.Specific) == methodNode.Method);
 _methodNode = methodNode;
 }

 protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler);

 public override ObjectNodeSection Section => ObjectNodeSection.ReadOnlyDataSection;
 public override bool StaticDependenciesAreComputed => true;
 public int Offset => 0;
 public override bool IsShareable => _methodNode.Method is InstantiatedMethod || EETypeNode.IsTypeNodeShareable(_methodNode.Method.OwningType);

 public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 {
 sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method));
 }

 public static bool MethodHasAssociatedData(NodeFactory factory, IMethodNode methodNode)
 {
 // Instantiating unboxing stubs. We need to store their non-unboxing target pointer (looked up by runtime)
 ISpecialUnboxThunkNode unboxThunk = methodNode as ISpecialUnboxThunkNode;
 if(unboxThunk != null && unboxThunk.IsSpecialUnboxingThunk)
 return true;

 return false;
 }

 public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 {
 Debug.Assert(MethodHasAssociatedData(factory, _methodNode));

 ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
 objData.RequireInitialAlignment(1);
 objData.AddSymbol(this);

 AssociatedDataFlags flags = AssociatedDataFlags.None;

 var flagsReservation = objData.ReserveByte();

 ISpecialUnboxThunkNode unboxThunkNode = _methodNode as ISpecialUnboxThunkNode;
 if (unboxThunkNode != null && unboxThunkNode.IsSpecialUnboxingThunk)
 {
 flags |= AssociatedDataFlags.HasUnboxingStubTarget;
 objData.EmitPointerReloc(unboxThunkNode.GetUnboxingThunkTarget(factory));
 }

 objData.EmitByte(flagsReservation, (byte)flags);

 return objData.ToObjectData();
 }
 }
}

26 changes: 25 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodCodeNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

namespace ILCompiler.DependencyAnalysis
{
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode, ISpecialUnboxThunkNode
 {
 public static readonly ObjectNodeSection StartSection = new ObjectNodeSection(".managedcode$A", SectionType.Executable);
 public static readonly ObjectNodeSection WindowsContentSection = new ObjectNodeSection(".managedcode$I", SectionType.Executable);
Expand DownExpand Up@@ -82,6 +82,12 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
 }
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 CodeBasedDependencyAlgorithm.AddDependenciesDueToMethodCodePresence(ref dependencies, factory, _method);

 return dependencies;
Expand All@@ -92,10 +98,28 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 return _methodCode;
 }

 public bool IsSpecialUnboxingThunk => ((CompilerTypeSystemContext)Method.Context).IsSpecialUnboxingThunk(_method);

 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 MethodDesc nonUnboxingMethod = ((CompilerTypeSystemContext)Method.Context).GetTargetOfSpecialUnboxingThunk(_method);
 return factory.MethodEntrypoint(nonUnboxingMethod, false);
 }

 public FrameInfo[] FrameInfos => _frameInfos;
 public byte[] GCInfo => _gcInfo;
 public ObjectData EHInfo => _ehInfo;

 public ISymbolNode GetAssociatedDataNode(NodeFactory factory)
 {
 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 return factory.MethodAssociatedData(this);

 return null;
 }

 public void InitializeFrameInfos(FrameInfo[] frameInfos)
 {
 Debug.Assert(_frameInfos == null);
Expand Down

11 changes: 11 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -296,6 +296,11 @@ private void CreateNodeCaches()

 _unboxingStubs = new NodeCache<MethodDesc, IMethodNode>(CreateUnboxingStubNode);

 _methodAssociatedData = new NodeCache<IMethodNode, MethodAssociatedDataNode>(methodNode =>
 {
 return new MethodAssociatedDataNode(methodNode);
 });

 _fatFunctionPointers = new NodeCache<MethodKey, FatFunctionPointerNode>(method =>
 {
 return new FatFunctionPointerNode(method.Method, method.IsUnboxingStub);
Expand DownExpand Up@@ -707,6 +712,7 @@ public IMethodNode StringAllocator(MethodDesc stringConstructor)

 private NodeCache<MethodDesc, IMethodNode> _methodEntrypoints;
 private NodeCache<MethodDesc, IMethodNode> _unboxingStubs;
 private NodeCache<IMethodNode, MethodAssociatedDataNode> _methodAssociatedData;

 public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false)
 {
Expand All@@ -718,6 +724,11 @@ public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false
 return _methodEntrypoints.GetOrAdd(method);
 }

 public MethodAssociatedDataNode MethodAssociatedData(IMethodNode methodNode)
 {
 return _methodAssociatedData.GetOrAdd(methodNode);
 }

 private NodeCache<MethodKey, FatFunctionPointerNode> _fatFunctionPointers;

 public IMethodNode FatFunctionPointer(MethodDesc method, bool isUnboxingStub = false)
Expand Down

30 changes: 29 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NonExternMethodSymbolNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@ namespace ILCompiler.DependencyAnalysis
 /// in the DependencyAnalysis infrastructure during compilation that is compiled 
 /// in the current compilation process
 /// </summary>
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols, ISpecialUnboxThunkNode
 {
 private MethodDesc _method;
 private bool _isUnboxing;
 private List<DependencyListEntry> _compilationDiscoveredDependencies;
 ISymbolNode[] _funcletSymbols = Array.Empty<ISymbolNode>();
 bool _dependenciesQueried;
Expand All@@ -29,6 +30,7 @@ public NonExternMethodSymbolNode(NodeFactory factory, MethodDesc method, bool is
 : base(isUnboxing ? UnboxingStubNode.GetMangledName(factory.NameMangler, method) :
 factory.NameMangler.GetMangledMethodName(method))
 {
 _isUnboxing = isUnboxing;
 _method = method;
 }

Expand All@@ -42,6 +44,26 @@ public MethodDesc Method
 }
 }

 public bool IsSpecialUnboxingThunk
 {
 get
 {
 if (_isUnboxing)
 {
 if (!_method.HasInstantiation && _method.OwningType.IsValueType && !_method.Signature.IsStatic)
 return _method.IsCanonicalMethod(CanonicalFormKind.Any);
 }

 return false;
 }
 }
 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 return factory.MethodEntrypoint(_method.GetCanonMethodTarget(CanonicalFormKind.Specific), false);
 }

 public bool HasCompiledBody => _hasCompiledBody;
 public void SetHasCompiledBody()
 {
Expand DownExpand Up@@ -99,6 +121,12 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
 dependencies.AddRange(_compilationDiscoveredDependencies);
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 return dependencies;
 }

Expand Down

35 changes: 27 additions & 8 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -432,11 +432,15 @@ public void PublishUnwindInfo(ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -458,15 +462,19 @@ public void PublishUnwindInfo(ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitBlob(blob);

 EmitIntValue((byte)flags, 1);

 if (associatedDataNode != null)
 {
 EmitSymbolRef(_sb.Clear().Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_ABSOLUTE);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append(_nodeFactory.NameMangler.CompilationUnitPrefix).Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_ABSOLUTE);
Expand DownExpand Up@@ -512,11 +520,15 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -539,10 +551,9 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitIntValue((byte)flags, 1);

 if (i != 0)
Expand All@@ -553,6 +564,14 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitIntValue((ulong)(start - frameInfos[0].StartOffset), 4);
 }

 if (associatedDataNode != null)
 {
 _sb.Clear();
 AppendExternCPrefix(_sb);
 EmitSymbolRef(_sb.Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_RELPTR32);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_RELPTR32);
Expand Down

6 changes: 4 additions & 2 deletions
src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@
 <Compile Include="Compiler\DependencyAnalysis\INodeWithRuntimeDeterminedDependencies.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedEETypeSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeMethodFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeModuleFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ResourceDataNode.cs" />
Expand All@@ -208,9 +208,11 @@
 <Compile Include="Compiler\DependencyAnalysis\EmbeddedPointerIndirectionNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\IMethodNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ISpecialUnboxThunkNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\InterfaceDispatchCellNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MetadataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodCodeNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodAssociatedDataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ArrayOfEmbeddedPointersNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ObjectNodeSection.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ReadyToRunHeaderNode.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge changes from TFS#4487
 Merged

jkotas
merged 1 commit into

from

Sep 12, 2017
 Merged


Merge changes from TFS
#4487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 7 additions & 4 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithCodeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,12 @@ namespace ILCompiler.DependencyAnalysis
 [Flags]
 public enum FrameInfoFlags
 {
 Handler = 0x01,
 Filter = 0x02,
 Handler = 0x01,
 Filter = 0x02,

 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasAssociatedData = 0x10,
 }

 public struct FrameInfo
Expand DownExpand Up@@ -48,5 +49,7 @@ ObjectNode.ObjectData EHInfo
 {
 get;
 }

 ISymbolNode GetAssociatedDataNode(NodeFactory factory);
 }
}

17 changes: 17 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ISpecialUnboxThunkNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Internal.TypeSystem;

namespace ILCompiler.DependencyAnalysis
{
 /// <summary>
 /// A dependency analysis node that represents a special instantiating unboxing stub.
 /// </summary>
 public interface ISpecialUnboxThunkNode : IMethodNode
 {
 bool IsSpecialUnboxingThunk { get; }
 ISymbolNode GetUnboxingThunkTarget(NodeFactory factory);
 }
}

83 changes: 83 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Diagnostics;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

namespace ILCompiler.DependencyAnalysis
{
 [Flags]
 public enum AssociatedDataFlags : byte
 {
 None = 0,
 HasUnboxingStubTarget = 1,
 }

 /// <summary>
 /// This node contains any custom data that we'd like to associated with a method. The unwind info of the method
 /// will have a reloc to this custom data if it exists. Not all methods need custom data to be emitted.
 /// This custom data excludes gcinfo and ehinfo (they are written by ObjectWriter during obj file emission).
 /// </summary>
 public class MethodAssociatedDataNode : ObjectNode, ISymbolDefinitionNode
 {
 private IMethodNode _methodNode;

 public MethodAssociatedDataNode(IMethodNode methodNode)
 {
 Debug.Assert(!methodNode.Method.IsAbstract);
 Debug.Assert(methodNode.Method.GetCanonMethodTarget(CanonicalFormKind.Specific) == methodNode.Method);
 _methodNode = methodNode;
 }

 protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler);

 public override ObjectNodeSection Section => ObjectNodeSection.ReadOnlyDataSection;
 public override bool StaticDependenciesAreComputed => true;
 public int Offset => 0;
 public override bool IsShareable => _methodNode.Method is InstantiatedMethod || EETypeNode.IsTypeNodeShareable(_methodNode.Method.OwningType);

 public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 {
 sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method));
 }

 public static bool MethodHasAssociatedData(NodeFactory factory, IMethodNode methodNode)
 {
 // Instantiating unboxing stubs. We need to store their non-unboxing target pointer (looked up by runtime)
 ISpecialUnboxThunkNode unboxThunk = methodNode as ISpecialUnboxThunkNode;
 if(unboxThunk != null && unboxThunk.IsSpecialUnboxingThunk)
 return true;

 return false;
 }

 public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 {
 Debug.Assert(MethodHasAssociatedData(factory, _methodNode));

 ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
 objData.RequireInitialAlignment(1);
 objData.AddSymbol(this);

 AssociatedDataFlags flags = AssociatedDataFlags.None;

 var flagsReservation = objData.ReserveByte();

 ISpecialUnboxThunkNode unboxThunkNode = _methodNode as ISpecialUnboxThunkNode;
 if (unboxThunkNode != null && unboxThunkNode.IsSpecialUnboxingThunk)
 {
 flags |= AssociatedDataFlags.HasUnboxingStubTarget;
 objData.EmitPointerReloc(unboxThunkNode.GetUnboxingThunkTarget(factory));
 }

 objData.EmitByte(flagsReservation, (byte)flags);

 return objData.ToObjectData();
 }
 }
}

26 changes: 25 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodCodeNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

namespace ILCompiler.DependencyAnalysis
{
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode, ISpecialUnboxThunkNode
 {
 public static readonly ObjectNodeSection StartSection = new ObjectNodeSection(".managedcode$A", SectionType.Executable);
 public static readonly ObjectNodeSection WindowsContentSection = new ObjectNodeSection(".managedcode$I", SectionType.Executable);
Expand DownExpand Up@@ -82,6 +82,12 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
 }
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 CodeBasedDependencyAlgorithm.AddDependenciesDueToMethodCodePresence(ref dependencies, factory, _method);

 return dependencies;
Expand All@@ -92,10 +98,28 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 return _methodCode;
 }

 public bool IsSpecialUnboxingThunk => ((CompilerTypeSystemContext)Method.Context).IsSpecialUnboxingThunk(_method);

 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 MethodDesc nonUnboxingMethod = ((CompilerTypeSystemContext)Method.Context).GetTargetOfSpecialUnboxingThunk(_method);
 return factory.MethodEntrypoint(nonUnboxingMethod, false);
 }

 public FrameInfo[] FrameInfos => _frameInfos;
 public byte[] GCInfo => _gcInfo;
 public ObjectData EHInfo => _ehInfo;

 public ISymbolNode GetAssociatedDataNode(NodeFactory factory)
 {
 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 return factory.MethodAssociatedData(this);

 return null;
 }

 public void InitializeFrameInfos(FrameInfo[] frameInfos)
 {
 Debug.Assert(_frameInfos == null);
Expand Down

11 changes: 11 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -296,6 +296,11 @@ private void CreateNodeCaches()

 _unboxingStubs = new NodeCache<MethodDesc, IMethodNode>(CreateUnboxingStubNode);

 _methodAssociatedData = new NodeCache<IMethodNode, MethodAssociatedDataNode>(methodNode =>
 {
 return new MethodAssociatedDataNode(methodNode);
 });

 _fatFunctionPointers = new NodeCache<MethodKey, FatFunctionPointerNode>(method =>
 {
 return new FatFunctionPointerNode(method.Method, method.IsUnboxingStub);
Expand DownExpand Up@@ -707,6 +712,7 @@ public IMethodNode StringAllocator(MethodDesc stringConstructor)

 private NodeCache<MethodDesc, IMethodNode> _methodEntrypoints;
 private NodeCache<MethodDesc, IMethodNode> _unboxingStubs;
 private NodeCache<IMethodNode, MethodAssociatedDataNode> _methodAssociatedData;

 public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false)
 {
Expand All@@ -718,6 +724,11 @@ public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false
 return _methodEntrypoints.GetOrAdd(method);
 }

 public MethodAssociatedDataNode MethodAssociatedData(IMethodNode methodNode)
 {
 return _methodAssociatedData.GetOrAdd(methodNode);
 }

 private NodeCache<MethodKey, FatFunctionPointerNode> _fatFunctionPointers;

 public IMethodNode FatFunctionPointer(MethodDesc method, bool isUnboxingStub = false)
Expand Down

30 changes: 29 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NonExternMethodSymbolNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@ namespace ILCompiler.DependencyAnalysis
 /// in the DependencyAnalysis infrastructure during compilation that is compiled 
 /// in the current compilation process
 /// </summary>
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols, ISpecialUnboxThunkNode
 {
 private MethodDesc _method;
 private bool _isUnboxing;
 private List<DependencyListEntry> _compilationDiscoveredDependencies;
 ISymbolNode[] _funcletSymbols = Array.Empty<ISymbolNode>();
 bool _dependenciesQueried;
Expand All@@ -29,6 +30,7 @@ public NonExternMethodSymbolNode(NodeFactory factory, MethodDesc method, bool is
 : base(isUnboxing ? UnboxingStubNode.GetMangledName(factory.NameMangler, method) :
 factory.NameMangler.GetMangledMethodName(method))
 {
 _isUnboxing = isUnboxing;
 _method = method;
 }

Expand All@@ -42,6 +44,26 @@ public MethodDesc Method
 }
 }

 public bool IsSpecialUnboxingThunk
 {
 get
 {
 if (_isUnboxing)
 {
 if (!_method.HasInstantiation && _method.OwningType.IsValueType && !_method.Signature.IsStatic)
 return _method.IsCanonicalMethod(CanonicalFormKind.Any);
 }

 return false;
 }
 }
 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 return factory.MethodEntrypoint(_method.GetCanonMethodTarget(CanonicalFormKind.Specific), false);
 }

 public bool HasCompiledBody => _hasCompiledBody;
 public void SetHasCompiledBody()
 {
Expand DownExpand Up@@ -99,6 +121,12 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
 dependencies.AddRange(_compilationDiscoveredDependencies);
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 return dependencies;
 }

Expand Down

35 changes: 27 additions & 8 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -432,11 +432,15 @@ public void PublishUnwindInfo(ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -458,15 +462,19 @@ public void PublishUnwindInfo(ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitBlob(blob);

 EmitIntValue((byte)flags, 1);

 if (associatedDataNode != null)
 {
 EmitSymbolRef(_sb.Clear().Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_ABSOLUTE);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append(_nodeFactory.NameMangler.CompilationUnitPrefix).Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_ABSOLUTE);
Expand DownExpand Up@@ -512,11 +520,15 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -539,10 +551,9 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitIntValue((byte)flags, 1);

 if (i != 0)
Expand All@@ -553,6 +564,14 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitIntValue((ulong)(start - frameInfos[0].StartOffset), 4);
 }

 if (associatedDataNode != null)
 {
 _sb.Clear();
 AppendExternCPrefix(_sb);
 EmitSymbolRef(_sb.Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_RELPTR32);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_RELPTR32);
Expand Down

6 changes: 4 additions & 2 deletions
src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@
 <Compile Include="Compiler\DependencyAnalysis\INodeWithRuntimeDeterminedDependencies.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedEETypeSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeMethodFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeModuleFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ResourceDataNode.cs" />
Expand All@@ -208,9 +208,11 @@
 <Compile Include="Compiler\DependencyAnalysis\EmbeddedPointerIndirectionNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\IMethodNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ISpecialUnboxThunkNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\InterfaceDispatchCellNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MetadataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodCodeNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodAssociatedDataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ArrayOfEmbeddedPointersNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ObjectNodeSection.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ReadyToRunHeaderNode.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge changes from TFS#4487
 Merged

jkotas
merged 1 commit into

from

Sep 12, 2017
 Merged


Merge changes from TFS
#4487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 7 additions & 4 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithCodeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,12 @@ namespace ILCompiler.DependencyAnalysis
 [Flags]
 public enum FrameInfoFlags
 {
 Handler = 0x01,
 Filter = 0x02,
 Handler = 0x01,
 Filter = 0x02,

 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasEHInfo = 0x04,
 ReversePInvoke = 0x08,
 HasAssociatedData = 0x10,
 }

 public struct FrameInfo
Expand DownExpand Up@@ -48,5 +49,7 @@ ObjectNode.ObjectData EHInfo
 {
 get;
 }

 ISymbolNode GetAssociatedDataNode(NodeFactory factory);
 }
}

17 changes: 17 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ISpecialUnboxThunkNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Internal.TypeSystem;

namespace ILCompiler.DependencyAnalysis
{
 /// <summary>
 /// A dependency analysis node that represents a special instantiating unboxing stub.
 /// </summary>
 public interface ISpecialUnboxThunkNode : IMethodNode
 {
 bool IsSpecialUnboxingThunk { get; }
 ISymbolNode GetUnboxingThunkTarget(NodeFactory factory);
 }
}

83 changes: 83 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Diagnostics;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Interop;

namespace ILCompiler.DependencyAnalysis
{
 [Flags]
 public enum AssociatedDataFlags : byte
 {
 None = 0,
 HasUnboxingStubTarget = 1,
 }

 /// <summary>
 /// This node contains any custom data that we'd like to associated with a method. The unwind info of the method
 /// will have a reloc to this custom data if it exists. Not all methods need custom data to be emitted.
 /// This custom data excludes gcinfo and ehinfo (they are written by ObjectWriter during obj file emission).
 /// </summary>
 public class MethodAssociatedDataNode : ObjectNode, ISymbolDefinitionNode
 {
 private IMethodNode _methodNode;

 public MethodAssociatedDataNode(IMethodNode methodNode)
 {
 Debug.Assert(!methodNode.Method.IsAbstract);
 Debug.Assert(methodNode.Method.GetCanonMethodTarget(CanonicalFormKind.Specific) == methodNode.Method);
 _methodNode = methodNode;
 }

 protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler);

 public override ObjectNodeSection Section => ObjectNodeSection.ReadOnlyDataSection;
 public override bool StaticDependenciesAreComputed => true;
 public int Offset => 0;
 public override bool IsShareable => _methodNode.Method is InstantiatedMethod || EETypeNode.IsTypeNodeShareable(_methodNode.Method.OwningType);

 public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 {
 sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method));
 }

 public static bool MethodHasAssociatedData(NodeFactory factory, IMethodNode methodNode)
 {
 // Instantiating unboxing stubs. We need to store their non-unboxing target pointer (looked up by runtime)
 ISpecialUnboxThunkNode unboxThunk = methodNode as ISpecialUnboxThunkNode;
 if(unboxThunk != null && unboxThunk.IsSpecialUnboxingThunk)
 return true;

 return false;
 }

 public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 {
 Debug.Assert(MethodHasAssociatedData(factory, _methodNode));

 ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
 objData.RequireInitialAlignment(1);
 objData.AddSymbol(this);

 AssociatedDataFlags flags = AssociatedDataFlags.None;

 var flagsReservation = objData.ReserveByte();

 ISpecialUnboxThunkNode unboxThunkNode = _methodNode as ISpecialUnboxThunkNode;
 if (unboxThunkNode != null && unboxThunkNode.IsSpecialUnboxingThunk)
 {
 flags |= AssociatedDataFlags.HasUnboxingStubTarget;
 objData.EmitPointerReloc(unboxThunkNode.GetUnboxingThunkTarget(factory));
 }

 objData.EmitByte(flagsReservation, (byte)flags);

 return objData.ToObjectData();
 }
 }
}

26 changes: 25 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MethodCodeNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

namespace ILCompiler.DependencyAnalysis
{
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode
 public class MethodCodeNode : ObjectNode, IMethodBodyNode, INodeWithCodeInfo, INodeWithDebugInfo, IMethodCodeNode, ISpecialUnboxThunkNode
 {
 public static readonly ObjectNodeSection StartSection = new ObjectNodeSection(".managedcode$A", SectionType.Executable);
 public static readonly ObjectNodeSection WindowsContentSection = new ObjectNodeSection(".managedcode$I", SectionType.Executable);
Expand DownExpand Up@@ -82,6 +82,12 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
 }
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 CodeBasedDependencyAlgorithm.AddDependenciesDueToMethodCodePresence(ref dependencies, factory, _method);

 return dependencies;
Expand All@@ -92,10 +98,28 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
 return _methodCode;
 }

 public bool IsSpecialUnboxingThunk => ((CompilerTypeSystemContext)Method.Context).IsSpecialUnboxingThunk(_method);

 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 MethodDesc nonUnboxingMethod = ((CompilerTypeSystemContext)Method.Context).GetTargetOfSpecialUnboxingThunk(_method);
 return factory.MethodEntrypoint(nonUnboxingMethod, false);
 }

 public FrameInfo[] FrameInfos => _frameInfos;
 public byte[] GCInfo => _gcInfo;
 public ObjectData EHInfo => _ehInfo;

 public ISymbolNode GetAssociatedDataNode(NodeFactory factory)
 {
 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 return factory.MethodAssociatedData(this);

 return null;
 }

 public void InitializeFrameInfos(FrameInfo[] frameInfos)
 {
 Debug.Assert(_frameInfos == null);
Expand Down

11 changes: 11 additions & 0 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NodeFactory.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -296,6 +296,11 @@ private void CreateNodeCaches()

 _unboxingStubs = new NodeCache<MethodDesc, IMethodNode>(CreateUnboxingStubNode);

 _methodAssociatedData = new NodeCache<IMethodNode, MethodAssociatedDataNode>(methodNode =>
 {
 return new MethodAssociatedDataNode(methodNode);
 });

 _fatFunctionPointers = new NodeCache<MethodKey, FatFunctionPointerNode>(method =>
 {
 return new FatFunctionPointerNode(method.Method, method.IsUnboxingStub);
Expand DownExpand Up@@ -707,6 +712,7 @@ public IMethodNode StringAllocator(MethodDesc stringConstructor)

 private NodeCache<MethodDesc, IMethodNode> _methodEntrypoints;
 private NodeCache<MethodDesc, IMethodNode> _unboxingStubs;
 private NodeCache<IMethodNode, MethodAssociatedDataNode> _methodAssociatedData;

 public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false)
 {
Expand All@@ -718,6 +724,11 @@ public IMethodNode MethodEntrypoint(MethodDesc method, bool unboxingStub = false
 return _methodEntrypoints.GetOrAdd(method);
 }

 public MethodAssociatedDataNode MethodAssociatedData(IMethodNode methodNode)
 {
 return _methodAssociatedData.GetOrAdd(methodNode);
 }

 private NodeCache<MethodKey, FatFunctionPointerNode> _fatFunctionPointers;

 public IMethodNode FatFunctionPointer(MethodDesc method, bool isUnboxingStub = false)
Expand Down

30 changes: 29 additions & 1 deletion
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/NonExternMethodSymbolNode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@ namespace ILCompiler.DependencyAnalysis
 /// in the DependencyAnalysis infrastructure during compilation that is compiled 
 /// in the current compilation process
 /// </summary>
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols
 public class NonExternMethodSymbolNode : ExternSymbolNode, IMethodBodyNodeWithFuncletSymbols, ISpecialUnboxThunkNode
 {
 private MethodDesc _method;
 private bool _isUnboxing;
 private List<DependencyListEntry> _compilationDiscoveredDependencies;
 ISymbolNode[] _funcletSymbols = Array.Empty<ISymbolNode>();
 bool _dependenciesQueried;
Expand All@@ -29,6 +30,7 @@ public NonExternMethodSymbolNode(NodeFactory factory, MethodDesc method, bool is
 : base(isUnboxing ? UnboxingStubNode.GetMangledName(factory.NameMangler, method) :
 factory.NameMangler.GetMangledMethodName(method))
 {
 _isUnboxing = isUnboxing;
 _method = method;
 }

Expand All@@ -42,6 +44,26 @@ public MethodDesc Method
 }
 }

 public bool IsSpecialUnboxingThunk
 {
 get
 {
 if (_isUnboxing)
 {
 if (!_method.HasInstantiation && _method.OwningType.IsValueType && !_method.Signature.IsStatic)
 return _method.IsCanonicalMethod(CanonicalFormKind.Any);
 }

 return false;
 }
 }
 public ISymbolNode GetUnboxingThunkTarget(NodeFactory factory)
 {
 Debug.Assert(IsSpecialUnboxingThunk);

 return factory.MethodEntrypoint(_method.GetCanonMethodTarget(CanonicalFormKind.Specific), false);
 }

 public bool HasCompiledBody => _hasCompiledBody;
 public void SetHasCompiledBody()
 {
Expand DownExpand Up@@ -99,6 +121,12 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
 dependencies.AddRange(_compilationDiscoveredDependencies);
 }

 if (MethodAssociatedDataNode.MethodHasAssociatedData(factory, this))
 {
 dependencies = dependencies ?? new DependencyList();
 dependencies.Add(new DependencyListEntry(factory.MethodAssociatedData(this), "Method associated data"));
 }

 return dependencies;
 }

Expand Down

35 changes: 27 additions & 8 deletions
src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -432,11 +432,15 @@ public void PublishUnwindInfo(ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -458,15 +462,19 @@ public void PublishUnwindInfo(ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitBlob(blob);

 EmitIntValue((byte)flags, 1);

 if (associatedDataNode != null)
 {
 EmitSymbolRef(_sb.Clear().Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_ABSOLUTE);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append(_nodeFactory.NameMangler.CompilationUnitPrefix).Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_ABSOLUTE);
Expand DownExpand Up@@ -512,11 +520,15 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 FrameInfo[] frameInfos = nodeWithCodeInfo.FrameInfos;
 if (frameInfos == null)
 {
 // Data should only be present if the method has unwind info
 Debug.Assert(nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory) == null);

 return;
 }

 byte[] gcInfo = nodeWithCodeInfo.GCInfo;
 ObjectData ehInfo = nodeWithCodeInfo.EHInfo;
 ISymbolNode associatedDataNode = nodeWithCodeInfo.GetAssociatedDataNode(_nodeFactory);

 for (int i = 0; i < frameInfos.Length; i++)
 {
Expand All@@ -539,10 +551,9 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitSymbolDef(blobSymbolName);

 FrameInfoFlags flags = frameInfo.Flags;
 if (ehInfo != null)
 {
 flags |= FrameInfoFlags.HasEHInfo;
 }
 flags |= ehInfo != null ? FrameInfoFlags.HasEHInfo : 0;
 flags |= associatedDataNode != null ? FrameInfoFlags.HasAssociatedData : 0;

 EmitIntValue((byte)flags, 1);

 if (i != 0)
Expand All@@ -553,6 +564,14 @@ public void BuildCFIMap(NodeFactory factory, ObjectNode node)
 EmitIntValue((ulong)(start - frameInfos[0].StartOffset), 4);
 }

 if (associatedDataNode != null)
 {
 _sb.Clear();
 AppendExternCPrefix(_sb);
 EmitSymbolRef(_sb.Append(associatedDataNode.GetMangledName(_nodeFactory.NameMangler)), RelocType.IMAGE_REL_BASED_RELPTR32);
 associatedDataNode = null;
 }

 if (ehInfo != null)
 {
 EmitSymbolRef(_sb.Clear().Append("_ehInfo").Append(_currentNodeZeroTerminatedName), RelocType.IMAGE_REL_BASED_RELPTR32);
Expand Down

6 changes: 4 additions & 2 deletions
src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,8 +190,8 @@
 <Compile Include="Compiler\DependencyAnalysis\INodeWithRuntimeDeterminedDependencies.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedEETypeSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ImportedStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ImportedThreadStaticsNode.cs" /> 
<Compile Include="Compiler\DependencyAnalysis\NonExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeMethodFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\PInvokeModuleFixupNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ResourceDataNode.cs" />
Expand All@@ -208,9 +208,11 @@
 <Compile Include="Compiler\DependencyAnalysis\EmbeddedPointerIndirectionNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ExternMethodSymbolNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\IMethodNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ISpecialUnboxThunkNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\InterfaceDispatchCellNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MetadataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodCodeNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\MethodAssociatedDataNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ArrayOfEmbeddedPointersNode.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ObjectNodeSection.cs" />
 <Compile Include="Compiler\DependencyAnalysis\ReadyToRunHeaderNode.cs" />
Expand Down
Loading