Skip to content

[release/7.0] For perf, remove Invoker pattern for fields#74693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 3 commits into from
Aug 28, 2022
Merged

[release/7.0] For perf, remove Invoker pattern for fields #74693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2b3a61
For perf, remove Invoker pattern for fields
steveharter Aug 25, 2022
ed7e1e7
Fix up runtime field layout
steveharter Aug 26, 2022
d3054d1
Add missing newline
steveharter Aug 26, 2022
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
103 changes: 29 additions & 74 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,12 @@ internal sealed unsafe class RtFieldInfo : RuntimeFieldInfo, IRuntimeFieldInfo
// lazy caching
private string? m_name;
private RuntimeType? m_fieldType;
internal FieldAccessor? m_invoker;

private InvocationFlags m_invocationFlags;
internal InvocationFlags InvocationFlags
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => (Invoker._invocationFlags & InvocationFlags.Initialized) != 0 ?
Invoker._invocationFlags : InitializeInvocationFlags();
}

private FieldAccessor Invoker
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get
{
m_invoker ??= new FieldAccessor(this);
return m_invoker;
}
get => (m_invocationFlags & InvocationFlags.Initialized) != 0 ?
m_invocationFlags : InitializeInvocationFlags();
}

[MethodImpl(MethodImplOptions.NoInlining)]
Expand DownExpand Up@@ -67,7 +56,7 @@ private InvocationFlags InitializeInvocationFlags()
}

// must be last to avoid threading problems
return Invoker._invocationFlags = invocationFlags | InvocationFlags.Initialized;
return m_invocationFlags = invocationFlags | InvocationFlags.Initialized;
}
#endregion

Expand DownExpand Up@@ -113,63 +102,6 @@ internal override bool CacheEquals(object? o)
return o is RtFieldInfo m && m.m_fieldHandle == m_fieldHandle;
}

[DebuggerStepThrough]
[DebuggerHidden]
internal object? GetValueNonEmit(object? obj)
{
RuntimeType? declaringType = DeclaringType as RuntimeType;
RuntimeType fieldType = (RuntimeType)FieldType;
bool domainInitialized = false;

if (declaringType == null)
{
return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
}
else
{
domainInitialized = declaringType.DomainInitialized;
object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
declaringType.DomainInitialized = domainInitialized;
return retVal;
}
}

[DebuggerStepThrough]
[DebuggerHidden]
internal void SetValueNonEmit(object? obj, object? value)
{
RuntimeType? declaringType = DeclaringType as RuntimeType;
RuntimeType fieldType = (RuntimeType)FieldType;
bool domainInitialized = false;

if (declaringType == null)
{
RuntimeFieldHandle.SetValue(
this,
obj,
value,
fieldType,
Attributes,
declaringType: null,
ref domainInitialized);
}
else
{
domainInitialized = declaringType.DomainInitialized;

RuntimeFieldHandle.SetValue(
this,
obj,
value,
fieldType,
Attributes,
declaringType,
ref domainInitialized);

declaringType.DomainInitialized = domainInitialized;
}
}

#endregion

#region MemberInfo Overrides
Expand DownExpand Up@@ -211,7 +143,20 @@ public override int GetHashCode() =>

CheckConsistency(obj);

return Invoker.GetValue(obj);
RuntimeType fieldType = (RuntimeType)FieldType;

bool domainInitialized = false;
if (declaringType == null)
{
return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
}
else
{
domainInitialized = declaringType.DomainInitialized;
object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
declaringType.DomainInitialized = domainInitialized;
return retVal;
}
}

public override object GetRawConstantValue() { throw new InvalidOperationException(); }
Expand DownExpand Up@@ -258,7 +203,17 @@ public override void SetValue(object? obj, object? value, BindingFlags invokeAtt
fieldType.CheckValue(ref value, copyBack: ref _ref, binder, culture, invokeAttr);
}

Invoker.SetValue(obj, value);
bool domainInitialized = false;
if (declaringType is null)
{
RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, null, ref domainInitialized);
}
else
{
domainInitialized = declaringType.DomainInitialized;
RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, declaringType, ref domainInitialized);
declaringType.DomainInitialized = domainInitialized;
}
}

[DebuggerStepThrough]
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1185,7 +1185,6 @@ public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepa
private object? m_d;
private int m_b;
private object? m_e;
private object? m_f;
private RuntimeFieldHandleInternal m_fieldHandle;
#pragma warning restore 414, 169

Expand Down
1 change: 0 additions & 1 deletion src/coreclr/vm/object.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,7 +1153,6 @@ class ReflectFieldObject : public BaseObjectWithCachedData
INT32 m_empty2;
OBJECTREF m_empty3;
OBJECTREF m_empty4;
OBJECTREF m_empty5;
FieldDesc * m_pFD;

public:
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -617,7 +617,6 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClause.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClauseOptions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAccessor.cs" Condition="'$(FeatureNativeAot)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAttributes.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\GenericParameterAttributes.cs" />
Expand DownExpand Up@@ -2456,4 +2455,4 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
</ItemGroup>
</Project>
</Project>
34 changes: 0 additions & 34 deletions src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs
View file
Open in desktop

This file was deleted.

31 changes: 2 additions & 29 deletions src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ internal abstract class RtFieldInfo : FieldInfo
internal abstract object UnsafeGetValue(object obj);
internal abstract void UnsafeSetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
internal abstract void CheckConsistency(object target);
internal abstract object? GetValueNonEmit(object? obj);
internal abstract void SetValueNonEmit(object? obj, object? value);
}

[StructLayout(LayoutKind.Sequential)]
Expand All@@ -51,19 +49,8 @@ internal sealed class RuntimeFieldInfo : RtFieldInfo
private string? name;
private Type? type;
private FieldAttributes attrs;
private FieldAccessor? invoker;
#pragma warning restore 649

private FieldAccessor Invoker
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get
{
invoker ??= new FieldAccessor(this);
return invoker;
}
}

public override Module Module
{
get
Expand DownExpand Up@@ -128,13 +115,6 @@ public override void SetValueDirect(TypedReference obj, object value)
}
}

[DebuggerStepThrough]
[DebuggerHidden]
internal override void SetValueNonEmit(object? obj, object? value)
{
SetValueInternal(this, obj, value);
}

[DebuggerStepThrough]
[DebuggerHidden]
public override object GetValueDirect(TypedReference obj)
Expand All@@ -149,13 +129,6 @@ public override object GetValueDirect(TypedReference obj)
}
}

[DebuggerStepThrough]
[DebuggerHidden]
internal override object? GetValueNonEmit(object? obj)
{
return GetValueInternal(obj);
}

public override FieldAttributes Attributes
{
get
Expand DownExpand Up@@ -239,7 +212,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
if (!IsLiteral)
CheckGeneric();

return Invoker.GetValue(obj);
return GetValueInternal(obj);
}

public override string ToString()
Expand DownExpand Up@@ -278,7 +251,7 @@ public override void SetValue(object? obj, object? val, BindingFlags invokeAttr,
}
}

Invoker.SetValue(obj, val);
SetValueInternal(this, obj, val);
}

internal RuntimeFieldInfo Clone(string newName)
Expand Down
, '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" + '
[release/7.0] For perf, remove Invoker pattern for fields by github-actions[bot] · Pull Request #74693 · dotnet/runtime · GitHub
Skip to content
[release/7.0] For perf, remove Invoker pattern for fields#74693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Aug 28, 2022
 Merged


[release/7.0] For perf, remove Invoker pattern for fields
#74693
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d2b3a61

For perf, remove Invoker pattern for fields


steveharter Aug 25, 2022
ed7e1e7

Fix up runtime field layout


steveharter Aug 26, 2022
d3054d1

Add missing newline


steveharter Aug 26, 2022

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


103 changes: 29 additions & 74 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,12 @@ internal sealed unsafe class RtFieldInfo : RuntimeFieldInfo, IRuntimeFieldInfo
 // lazy caching
 private string? m_name;
 private RuntimeType? m_fieldType;
 internal FieldAccessor? m_invoker;

 private InvocationFlags m_invocationFlags;
 internal InvocationFlags InvocationFlags
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get => (Invoker._invocationFlags & InvocationFlags.Initialized) != 0 ?
 Invoker._invocationFlags : InitializeInvocationFlags();
 }

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 m_invoker ??= new FieldAccessor(this);
 return m_invoker;
 }
 get => (m_invocationFlags & InvocationFlags.Initialized) != 0 ?
 m_invocationFlags : InitializeInvocationFlags();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
Expand DownExpand Up@@ -67,7 +56,7 @@ private InvocationFlags InitializeInvocationFlags()
 }

 // must be last to avoid threading problems
 return Invoker._invocationFlags = invocationFlags | InvocationFlags.Initialized;
 return m_invocationFlags = invocationFlags | InvocationFlags.Initialized;
 }
 #endregion

Expand DownExpand Up@@ -113,63 +102,6 @@ internal override bool CacheEquals(object? o)
 return o is RtFieldInfo m && m.m_fieldHandle == m_fieldHandle;
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal object? GetValueNonEmit(object? obj)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal void SetValueNonEmit(object? obj, object? value)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType: null,
 ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;

 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType,
 ref domainInitialized);

 declaringType.DomainInitialized = domainInitialized;
 }
 }

 #endregion

 #region MemberInfo Overrides
Expand DownExpand Up@@ -211,7 +143,20 @@ public override int GetHashCode() =>

 CheckConsistency(obj);

 return Invoker.GetValue(obj);
 RuntimeType fieldType = (RuntimeType)FieldType;

 bool domainInitialized = false;
 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 public override object GetRawConstantValue() { throw new InvalidOperationException(); }
Expand DownExpand Up@@ -258,7 +203,17 @@ public override void SetValue(object? obj, object? value, BindingFlags invokeAtt
 fieldType.CheckValue(ref value, copyBack: ref _ref, binder, culture, invokeAttr);
 }

 Invoker.SetValue(obj, value);
 bool domainInitialized = false;
 if (declaringType is null)
 {
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 }
 }

 [DebuggerStepThrough]
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1185,7 +1185,6 @@ public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepa
 private object? m_d;
 private int m_b;
 private object? m_e;
 private object? m_f;
 private RuntimeFieldHandleInternal m_fieldHandle;
#pragma warning restore 414, 169

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/object.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,7 +1153,6 @@ class ReflectFieldObject : public BaseObjectWithCachedData
 INT32 m_empty2;
 OBJECTREF m_empty3;
 OBJECTREF m_empty4;
 OBJECTREF m_empty5;
 FieldDesc * m_pFD;

public:
Expand Down

3 changes: 1 addition & 2 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -617,7 +617,6 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClause.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClauseOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAccessor.cs" Condition="'$(FeatureNativeAot)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAttributes.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\GenericParameterAttributes.cs" />
Expand DownExpand Up@@ -2456,4 +2455,4 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
 </ItemGroup>
</Project>
</Project>

34 changes: 0 additions & 34 deletions
src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs

View file


Open in desktop


This file was deleted.


31 changes: 2 additions & 29 deletions
src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ internal abstract class RtFieldInfo : FieldInfo
 internal abstract object UnsafeGetValue(object obj);
 internal abstract void UnsafeSetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
 internal abstract void CheckConsistency(object target);
 internal abstract object? GetValueNonEmit(object? obj);
 internal abstract void SetValueNonEmit(object? obj, object? value);
 }

 [StructLayout(LayoutKind.Sequential)]
Expand All@@ -51,19 +49,8 @@ internal sealed class RuntimeFieldInfo : RtFieldInfo
 private string? name;
 private Type? type;
 private FieldAttributes attrs;
 private FieldAccessor? invoker;
#pragma warning restore 649

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 invoker ??= new FieldAccessor(this);
 return invoker;
 }
 }

 public override Module Module
 {
 get
Expand DownExpand Up@@ -128,13 +115,6 @@ public override void SetValueDirect(TypedReference obj, object value)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override void SetValueNonEmit(object? obj, object? value)
 {
 SetValueInternal(this, obj, value);
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 public override object GetValueDirect(TypedReference obj)
Expand All@@ -149,13 +129,6 @@ public override object GetValueDirect(TypedReference obj)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override object? GetValueNonEmit(object? obj)
 {
 return GetValueInternal(obj);
 }

 public override FieldAttributes Attributes
 {
 get
Expand DownExpand Up@@ -239,7 +212,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
 if (!IsLiteral)
 CheckGeneric();

 return Invoker.GetValue(obj);
 return GetValueInternal(obj);
 }

 public override string ToString()
Expand DownExpand Up@@ -278,7 +251,7 @@ public override void SetValue(object? obj, object? val, BindingFlags invokeAttr,
 }
 }

Invoker.SetValue(obj, val);
SetValueInternal(this, obj, val);
 }

 internal RuntimeFieldInfo Clone(string newName)
Expand Down

, '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('^' + ".*" + '
[release/7.0] For perf, remove Invoker pattern for fields by github-actions[bot] · Pull Request #74693 · dotnet/runtime · GitHub
Skip to content
[release/7.0] For perf, remove Invoker pattern for fields#74693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Aug 28, 2022
 Merged


[release/7.0] For perf, remove Invoker pattern for fields
#74693
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d2b3a61

For perf, remove Invoker pattern for fields


steveharter Aug 25, 2022
ed7e1e7

Fix up runtime field layout


steveharter Aug 26, 2022
d3054d1

Add missing newline


steveharter Aug 26, 2022

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


103 changes: 29 additions & 74 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,12 @@ internal sealed unsafe class RtFieldInfo : RuntimeFieldInfo, IRuntimeFieldInfo
 // lazy caching
 private string? m_name;
 private RuntimeType? m_fieldType;
 internal FieldAccessor? m_invoker;

 private InvocationFlags m_invocationFlags;
 internal InvocationFlags InvocationFlags
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get => (Invoker._invocationFlags & InvocationFlags.Initialized) != 0 ?
 Invoker._invocationFlags : InitializeInvocationFlags();
 }

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 m_invoker ??= new FieldAccessor(this);
 return m_invoker;
 }
 get => (m_invocationFlags & InvocationFlags.Initialized) != 0 ?
 m_invocationFlags : InitializeInvocationFlags();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
Expand DownExpand Up@@ -67,7 +56,7 @@ private InvocationFlags InitializeInvocationFlags()
 }

 // must be last to avoid threading problems
 return Invoker._invocationFlags = invocationFlags | InvocationFlags.Initialized;
 return m_invocationFlags = invocationFlags | InvocationFlags.Initialized;
 }
 #endregion

Expand DownExpand Up@@ -113,63 +102,6 @@ internal override bool CacheEquals(object? o)
 return o is RtFieldInfo m && m.m_fieldHandle == m_fieldHandle;
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal object? GetValueNonEmit(object? obj)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal void SetValueNonEmit(object? obj, object? value)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType: null,
 ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;

 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType,
 ref domainInitialized);

 declaringType.DomainInitialized = domainInitialized;
 }
 }

 #endregion

 #region MemberInfo Overrides
Expand DownExpand Up@@ -211,7 +143,20 @@ public override int GetHashCode() =>

 CheckConsistency(obj);

 return Invoker.GetValue(obj);
 RuntimeType fieldType = (RuntimeType)FieldType;

 bool domainInitialized = false;
 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 public override object GetRawConstantValue() { throw new InvalidOperationException(); }
Expand DownExpand Up@@ -258,7 +203,17 @@ public override void SetValue(object? obj, object? value, BindingFlags invokeAtt
 fieldType.CheckValue(ref value, copyBack: ref _ref, binder, culture, invokeAttr);
 }

 Invoker.SetValue(obj, value);
 bool domainInitialized = false;
 if (declaringType is null)
 {
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 }
 }

 [DebuggerStepThrough]
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1185,7 +1185,6 @@ public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepa
 private object? m_d;
 private int m_b;
 private object? m_e;
 private object? m_f;
 private RuntimeFieldHandleInternal m_fieldHandle;
#pragma warning restore 414, 169

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/object.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,7 +1153,6 @@ class ReflectFieldObject : public BaseObjectWithCachedData
 INT32 m_empty2;
 OBJECTREF m_empty3;
 OBJECTREF m_empty4;
 OBJECTREF m_empty5;
 FieldDesc * m_pFD;

public:
Expand Down

3 changes: 1 addition & 2 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -617,7 +617,6 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClause.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClauseOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAccessor.cs" Condition="'$(FeatureNativeAot)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAttributes.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\GenericParameterAttributes.cs" />
Expand DownExpand Up@@ -2456,4 +2455,4 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
 </ItemGroup>
</Project>
</Project>

34 changes: 0 additions & 34 deletions
src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs

View file


Open in desktop


This file was deleted.


31 changes: 2 additions & 29 deletions
src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ internal abstract class RtFieldInfo : FieldInfo
 internal abstract object UnsafeGetValue(object obj);
 internal abstract void UnsafeSetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
 internal abstract void CheckConsistency(object target);
 internal abstract object? GetValueNonEmit(object? obj);
 internal abstract void SetValueNonEmit(object? obj, object? value);
 }

 [StructLayout(LayoutKind.Sequential)]
Expand All@@ -51,19 +49,8 @@ internal sealed class RuntimeFieldInfo : RtFieldInfo
 private string? name;
 private Type? type;
 private FieldAttributes attrs;
 private FieldAccessor? invoker;
#pragma warning restore 649

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 invoker ??= new FieldAccessor(this);
 return invoker;
 }
 }

 public override Module Module
 {
 get
Expand DownExpand Up@@ -128,13 +115,6 @@ public override void SetValueDirect(TypedReference obj, object value)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override void SetValueNonEmit(object? obj, object? value)
 {
 SetValueInternal(this, obj, value);
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 public override object GetValueDirect(TypedReference obj)
Expand All@@ -149,13 +129,6 @@ public override object GetValueDirect(TypedReference obj)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override object? GetValueNonEmit(object? obj)
 {
 return GetValueInternal(obj);
 }

 public override FieldAttributes Attributes
 {
 get
Expand DownExpand Up@@ -239,7 +212,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
 if (!IsLiteral)
 CheckGeneric();

 return Invoker.GetValue(obj);
 return GetValueInternal(obj);
 }

 public override string ToString()
Expand DownExpand Up@@ -278,7 +251,7 @@ public override void SetValue(object? obj, object? val, BindingFlags invokeAttr,
 }
 }

Invoker.SetValue(obj, val);
SetValueInternal(this, obj, val);
 }

 internal RuntimeFieldInfo Clone(string newName)
Expand Down

, '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('^' + ".*" + '
[release/7.0] For perf, remove Invoker pattern for fields by github-actions[bot] · Pull Request #74693 · dotnet/runtime · GitHub
Skip to content
[release/7.0] For perf, remove Invoker pattern for fields#74693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Aug 28, 2022
 Merged


[release/7.0] For perf, remove Invoker pattern for fields
#74693
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d2b3a61

For perf, remove Invoker pattern for fields


steveharter Aug 25, 2022
ed7e1e7

Fix up runtime field layout


steveharter Aug 26, 2022
d3054d1

Add missing newline


steveharter Aug 26, 2022

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


103 changes: 29 additions & 74 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,12 @@ internal sealed unsafe class RtFieldInfo : RuntimeFieldInfo, IRuntimeFieldInfo
 // lazy caching
 private string? m_name;
 private RuntimeType? m_fieldType;
 internal FieldAccessor? m_invoker;

 private InvocationFlags m_invocationFlags;
 internal InvocationFlags InvocationFlags
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get => (Invoker._invocationFlags & InvocationFlags.Initialized) != 0 ?
 Invoker._invocationFlags : InitializeInvocationFlags();
 }

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 m_invoker ??= new FieldAccessor(this);
 return m_invoker;
 }
 get => (m_invocationFlags & InvocationFlags.Initialized) != 0 ?
 m_invocationFlags : InitializeInvocationFlags();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
Expand DownExpand Up@@ -67,7 +56,7 @@ private InvocationFlags InitializeInvocationFlags()
 }

 // must be last to avoid threading problems
 return Invoker._invocationFlags = invocationFlags | InvocationFlags.Initialized;
 return m_invocationFlags = invocationFlags | InvocationFlags.Initialized;
 }
 #endregion

Expand DownExpand Up@@ -113,63 +102,6 @@ internal override bool CacheEquals(object? o)
 return o is RtFieldInfo m && m.m_fieldHandle == m_fieldHandle;
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal object? GetValueNonEmit(object? obj)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal void SetValueNonEmit(object? obj, object? value)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType: null,
 ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;

 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType,
 ref domainInitialized);

 declaringType.DomainInitialized = domainInitialized;
 }
 }

 #endregion

 #region MemberInfo Overrides
Expand DownExpand Up@@ -211,7 +143,20 @@ public override int GetHashCode() =>

 CheckConsistency(obj);

 return Invoker.GetValue(obj);
 RuntimeType fieldType = (RuntimeType)FieldType;

 bool domainInitialized = false;
 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 public override object GetRawConstantValue() { throw new InvalidOperationException(); }
Expand DownExpand Up@@ -258,7 +203,17 @@ public override void SetValue(object? obj, object? value, BindingFlags invokeAtt
 fieldType.CheckValue(ref value, copyBack: ref _ref, binder, culture, invokeAttr);
 }

 Invoker.SetValue(obj, value);
 bool domainInitialized = false;
 if (declaringType is null)
 {
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 }
 }

 [DebuggerStepThrough]
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1185,7 +1185,6 @@ public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepa
 private object? m_d;
 private int m_b;
 private object? m_e;
 private object? m_f;
 private RuntimeFieldHandleInternal m_fieldHandle;
#pragma warning restore 414, 169

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/object.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,7 +1153,6 @@ class ReflectFieldObject : public BaseObjectWithCachedData
 INT32 m_empty2;
 OBJECTREF m_empty3;
 OBJECTREF m_empty4;
 OBJECTREF m_empty5;
 FieldDesc * m_pFD;

public:
Expand Down

3 changes: 1 addition & 2 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -617,7 +617,6 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClause.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClauseOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAccessor.cs" Condition="'$(FeatureNativeAot)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAttributes.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\GenericParameterAttributes.cs" />
Expand DownExpand Up@@ -2456,4 +2455,4 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
 </ItemGroup>
</Project>
</Project>

34 changes: 0 additions & 34 deletions
src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs

View file


Open in desktop


This file was deleted.


31 changes: 2 additions & 29 deletions
src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ internal abstract class RtFieldInfo : FieldInfo
 internal abstract object UnsafeGetValue(object obj);
 internal abstract void UnsafeSetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
 internal abstract void CheckConsistency(object target);
 internal abstract object? GetValueNonEmit(object? obj);
 internal abstract void SetValueNonEmit(object? obj, object? value);
 }

 [StructLayout(LayoutKind.Sequential)]
Expand All@@ -51,19 +49,8 @@ internal sealed class RuntimeFieldInfo : RtFieldInfo
 private string? name;
 private Type? type;
 private FieldAttributes attrs;
 private FieldAccessor? invoker;
#pragma warning restore 649

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 invoker ??= new FieldAccessor(this);
 return invoker;
 }
 }

 public override Module Module
 {
 get
Expand DownExpand Up@@ -128,13 +115,6 @@ public override void SetValueDirect(TypedReference obj, object value)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override void SetValueNonEmit(object? obj, object? value)
 {
 SetValueInternal(this, obj, value);
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 public override object GetValueDirect(TypedReference obj)
Expand All@@ -149,13 +129,6 @@ public override object GetValueDirect(TypedReference obj)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override object? GetValueNonEmit(object? obj)
 {
 return GetValueInternal(obj);
 }

 public override FieldAttributes Attributes
 {
 get
Expand DownExpand Up@@ -239,7 +212,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
 if (!IsLiteral)
 CheckGeneric();

 return Invoker.GetValue(obj);
 return GetValueInternal(obj);
 }

 public override string ToString()
Expand DownExpand Up@@ -278,7 +251,7 @@ public override void SetValue(object? obj, object? val, BindingFlags invokeAttr,
 }
 }

Invoker.SetValue(obj, val);
SetValueInternal(this, obj, val);
 }

 internal RuntimeFieldInfo Clone(string newName)
Expand Down

, '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" + '
[release/7.0] For perf, remove Invoker pattern for fields by github-actions[bot] · Pull Request #74693 · dotnet/runtime · GitHub
Skip to content
[release/7.0] For perf, remove Invoker pattern for fields#74693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Aug 28, 2022
 Merged


[release/7.0] For perf, remove Invoker pattern for fields
#74693
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d2b3a61

For perf, remove Invoker pattern for fields


steveharter Aug 25, 2022
ed7e1e7

Fix up runtime field layout


steveharter Aug 26, 2022
d3054d1

Add missing newline


steveharter Aug 26, 2022

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


103 changes: 29 additions & 74 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,12 @@ internal sealed unsafe class RtFieldInfo : RuntimeFieldInfo, IRuntimeFieldInfo
 // lazy caching
 private string? m_name;
 private RuntimeType? m_fieldType;
 internal FieldAccessor? m_invoker;

 private InvocationFlags m_invocationFlags;
 internal InvocationFlags InvocationFlags
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get => (Invoker._invocationFlags & InvocationFlags.Initialized) != 0 ?
 Invoker._invocationFlags : InitializeInvocationFlags();
 }

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 m_invoker ??= new FieldAccessor(this);
 return m_invoker;
 }
 get => (m_invocationFlags & InvocationFlags.Initialized) != 0 ?
 m_invocationFlags : InitializeInvocationFlags();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
Expand DownExpand Up@@ -67,7 +56,7 @@ private InvocationFlags InitializeInvocationFlags()
 }

 // must be last to avoid threading problems
 return Invoker._invocationFlags = invocationFlags | InvocationFlags.Initialized;
 return m_invocationFlags = invocationFlags | InvocationFlags.Initialized;
 }
 #endregion

Expand DownExpand Up@@ -113,63 +102,6 @@ internal override bool CacheEquals(object? o)
 return o is RtFieldInfo m && m.m_fieldHandle == m_fieldHandle;
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal object? GetValueNonEmit(object? obj)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal void SetValueNonEmit(object? obj, object? value)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType: null,
 ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;

 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType,
 ref domainInitialized);

 declaringType.DomainInitialized = domainInitialized;
 }
 }

 #endregion

 #region MemberInfo Overrides
Expand DownExpand Up@@ -211,7 +143,20 @@ public override int GetHashCode() =>

 CheckConsistency(obj);

 return Invoker.GetValue(obj);
 RuntimeType fieldType = (RuntimeType)FieldType;

 bool domainInitialized = false;
 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 public override object GetRawConstantValue() { throw new InvalidOperationException(); }
Expand DownExpand Up@@ -258,7 +203,17 @@ public override void SetValue(object? obj, object? value, BindingFlags invokeAtt
 fieldType.CheckValue(ref value, copyBack: ref _ref, binder, culture, invokeAttr);
 }

 Invoker.SetValue(obj, value);
 bool domainInitialized = false;
 if (declaringType is null)
 {
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 }
 }

 [DebuggerStepThrough]
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1185,7 +1185,6 @@ public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepa
 private object? m_d;
 private int m_b;
 private object? m_e;
 private object? m_f;
 private RuntimeFieldHandleInternal m_fieldHandle;
#pragma warning restore 414, 169

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/object.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,7 +1153,6 @@ class ReflectFieldObject : public BaseObjectWithCachedData
 INT32 m_empty2;
 OBJECTREF m_empty3;
 OBJECTREF m_empty4;
 OBJECTREF m_empty5;
 FieldDesc * m_pFD;

public:
Expand Down

3 changes: 1 addition & 2 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -617,7 +617,6 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClause.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClauseOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAccessor.cs" Condition="'$(FeatureNativeAot)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAttributes.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\GenericParameterAttributes.cs" />
Expand DownExpand Up@@ -2456,4 +2455,4 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
 </ItemGroup>
</Project>
</Project>

34 changes: 0 additions & 34 deletions
src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs

View file


Open in desktop


This file was deleted.


31 changes: 2 additions & 29 deletions
src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ internal abstract class RtFieldInfo : FieldInfo
 internal abstract object UnsafeGetValue(object obj);
 internal abstract void UnsafeSetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
 internal abstract void CheckConsistency(object target);
 internal abstract object? GetValueNonEmit(object? obj);
 internal abstract void SetValueNonEmit(object? obj, object? value);
 }

 [StructLayout(LayoutKind.Sequential)]
Expand All@@ -51,19 +49,8 @@ internal sealed class RuntimeFieldInfo : RtFieldInfo
 private string? name;
 private Type? type;
 private FieldAttributes attrs;
 private FieldAccessor? invoker;
#pragma warning restore 649

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 invoker ??= new FieldAccessor(this);
 return invoker;
 }
 }

 public override Module Module
 {
 get
Expand DownExpand Up@@ -128,13 +115,6 @@ public override void SetValueDirect(TypedReference obj, object value)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override void SetValueNonEmit(object? obj, object? value)
 {
 SetValueInternal(this, obj, value);
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 public override object GetValueDirect(TypedReference obj)
Expand All@@ -149,13 +129,6 @@ public override object GetValueDirect(TypedReference obj)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override object? GetValueNonEmit(object? obj)
 {
 return GetValueInternal(obj);
 }

 public override FieldAttributes Attributes
 {
 get
Expand DownExpand Up@@ -239,7 +212,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
 if (!IsLiteral)
 CheckGeneric();

 return Invoker.GetValue(obj);
 return GetValueInternal(obj);
 }

 public override string ToString()
Expand DownExpand Up@@ -278,7 +251,7 @@ public override void SetValue(object? obj, object? val, BindingFlags invokeAttr,
 }
 }

Invoker.SetValue(obj, val);
SetValueInternal(this, obj, val);
 }

 internal RuntimeFieldInfo Clone(string newName)
Expand Down

, '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('^' + ".*" + '
[release/7.0] For perf, remove Invoker pattern for fields by github-actions[bot] · Pull Request #74693 · dotnet/runtime · GitHub
Skip to content
[release/7.0] For perf, remove Invoker pattern for fields#74693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Aug 28, 2022
 Merged


[release/7.0] For perf, remove Invoker pattern for fields
#74693
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d2b3a61

For perf, remove Invoker pattern for fields


steveharter Aug 25, 2022
ed7e1e7

Fix up runtime field layout


steveharter Aug 26, 2022
d3054d1

Add missing newline


steveharter Aug 26, 2022

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


103 changes: 29 additions & 74 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,12 @@ internal sealed unsafe class RtFieldInfo : RuntimeFieldInfo, IRuntimeFieldInfo
 // lazy caching
 private string? m_name;
 private RuntimeType? m_fieldType;
 internal FieldAccessor? m_invoker;

 private InvocationFlags m_invocationFlags;
 internal InvocationFlags InvocationFlags
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get => (Invoker._invocationFlags & InvocationFlags.Initialized) != 0 ?
 Invoker._invocationFlags : InitializeInvocationFlags();
 }

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 m_invoker ??= new FieldAccessor(this);
 return m_invoker;
 }
 get => (m_invocationFlags & InvocationFlags.Initialized) != 0 ?
 m_invocationFlags : InitializeInvocationFlags();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
Expand DownExpand Up@@ -67,7 +56,7 @@ private InvocationFlags InitializeInvocationFlags()
 }

 // must be last to avoid threading problems
 return Invoker._invocationFlags = invocationFlags | InvocationFlags.Initialized;
 return m_invocationFlags = invocationFlags | InvocationFlags.Initialized;
 }
 #endregion

Expand DownExpand Up@@ -113,63 +102,6 @@ internal override bool CacheEquals(object? o)
 return o is RtFieldInfo m && m.m_fieldHandle == m_fieldHandle;
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal object? GetValueNonEmit(object? obj)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal void SetValueNonEmit(object? obj, object? value)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType: null,
 ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;

 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType,
 ref domainInitialized);

 declaringType.DomainInitialized = domainInitialized;
 }
 }

 #endregion

 #region MemberInfo Overrides
Expand DownExpand Up@@ -211,7 +143,20 @@ public override int GetHashCode() =>

 CheckConsistency(obj);

 return Invoker.GetValue(obj);
 RuntimeType fieldType = (RuntimeType)FieldType;

 bool domainInitialized = false;
 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 public override object GetRawConstantValue() { throw new InvalidOperationException(); }
Expand DownExpand Up@@ -258,7 +203,17 @@ public override void SetValue(object? obj, object? value, BindingFlags invokeAtt
 fieldType.CheckValue(ref value, copyBack: ref _ref, binder, culture, invokeAttr);
 }

 Invoker.SetValue(obj, value);
 bool domainInitialized = false;
 if (declaringType is null)
 {
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 }
 }

 [DebuggerStepThrough]
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1185,7 +1185,6 @@ public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepa
 private object? m_d;
 private int m_b;
 private object? m_e;
 private object? m_f;
 private RuntimeFieldHandleInternal m_fieldHandle;
#pragma warning restore 414, 169

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/object.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,7 +1153,6 @@ class ReflectFieldObject : public BaseObjectWithCachedData
 INT32 m_empty2;
 OBJECTREF m_empty3;
 OBJECTREF m_empty4;
 OBJECTREF m_empty5;
 FieldDesc * m_pFD;

public:
Expand Down

3 changes: 1 addition & 2 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -617,7 +617,6 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClause.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClauseOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAccessor.cs" Condition="'$(FeatureNativeAot)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAttributes.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\GenericParameterAttributes.cs" />
Expand DownExpand Up@@ -2456,4 +2455,4 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
 </ItemGroup>
</Project>
</Project>

34 changes: 0 additions & 34 deletions
src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs

View file


Open in desktop


This file was deleted.


31 changes: 2 additions & 29 deletions
src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ internal abstract class RtFieldInfo : FieldInfo
 internal abstract object UnsafeGetValue(object obj);
 internal abstract void UnsafeSetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
 internal abstract void CheckConsistency(object target);
 internal abstract object? GetValueNonEmit(object? obj);
 internal abstract void SetValueNonEmit(object? obj, object? value);
 }

 [StructLayout(LayoutKind.Sequential)]
Expand All@@ -51,19 +49,8 @@ internal sealed class RuntimeFieldInfo : RtFieldInfo
 private string? name;
 private Type? type;
 private FieldAttributes attrs;
 private FieldAccessor? invoker;
#pragma warning restore 649

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 invoker ??= new FieldAccessor(this);
 return invoker;
 }
 }

 public override Module Module
 {
 get
Expand DownExpand Up@@ -128,13 +115,6 @@ public override void SetValueDirect(TypedReference obj, object value)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override void SetValueNonEmit(object? obj, object? value)
 {
 SetValueInternal(this, obj, value);
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 public override object GetValueDirect(TypedReference obj)
Expand All@@ -149,13 +129,6 @@ public override object GetValueDirect(TypedReference obj)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override object? GetValueNonEmit(object? obj)
 {
 return GetValueInternal(obj);
 }

 public override FieldAttributes Attributes
 {
 get
Expand DownExpand Up@@ -239,7 +212,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
 if (!IsLiteral)
 CheckGeneric();

 return Invoker.GetValue(obj);
 return GetValueInternal(obj);
 }

 public override string ToString()
Expand DownExpand Up@@ -278,7 +251,7 @@ public override void SetValue(object? obj, object? val, BindingFlags invokeAttr,
 }
 }

Invoker.SetValue(obj, val);
SetValueInternal(this, obj, val);
 }

 internal RuntimeFieldInfo Clone(string newName)
Expand Down

, '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('^' + ".*" + '
[release/7.0] For perf, remove Invoker pattern for fields by github-actions[bot] · Pull Request #74693 · dotnet/runtime · GitHub
Skip to content
[release/7.0] For perf, remove Invoker pattern for fields#74693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Aug 28, 2022
 Merged


[release/7.0] For perf, remove Invoker pattern for fields
#74693
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d2b3a61

For perf, remove Invoker pattern for fields


steveharter Aug 25, 2022
ed7e1e7

Fix up runtime field layout


steveharter Aug 26, 2022
d3054d1

Add missing newline


steveharter Aug 26, 2022

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


103 changes: 29 additions & 74 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,12 @@ internal sealed unsafe class RtFieldInfo : RuntimeFieldInfo, IRuntimeFieldInfo
 // lazy caching
 private string? m_name;
 private RuntimeType? m_fieldType;
 internal FieldAccessor? m_invoker;

 private InvocationFlags m_invocationFlags;
 internal InvocationFlags InvocationFlags
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get => (Invoker._invocationFlags & InvocationFlags.Initialized) != 0 ?
 Invoker._invocationFlags : InitializeInvocationFlags();
 }

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 m_invoker ??= new FieldAccessor(this);
 return m_invoker;
 }
 get => (m_invocationFlags & InvocationFlags.Initialized) != 0 ?
 m_invocationFlags : InitializeInvocationFlags();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
Expand DownExpand Up@@ -67,7 +56,7 @@ private InvocationFlags InitializeInvocationFlags()
 }

 // must be last to avoid threading problems
 return Invoker._invocationFlags = invocationFlags | InvocationFlags.Initialized;
 return m_invocationFlags = invocationFlags | InvocationFlags.Initialized;
 }
 #endregion

Expand DownExpand Up@@ -113,63 +102,6 @@ internal override bool CacheEquals(object? o)
 return o is RtFieldInfo m && m.m_fieldHandle == m_fieldHandle;
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal object? GetValueNonEmit(object? obj)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal void SetValueNonEmit(object? obj, object? value)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType: null,
 ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;

 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType,
 ref domainInitialized);

 declaringType.DomainInitialized = domainInitialized;
 }
 }

 #endregion

 #region MemberInfo Overrides
Expand DownExpand Up@@ -211,7 +143,20 @@ public override int GetHashCode() =>

 CheckConsistency(obj);

 return Invoker.GetValue(obj);
 RuntimeType fieldType = (RuntimeType)FieldType;

 bool domainInitialized = false;
 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 public override object GetRawConstantValue() { throw new InvalidOperationException(); }
Expand DownExpand Up@@ -258,7 +203,17 @@ public override void SetValue(object? obj, object? value, BindingFlags invokeAtt
 fieldType.CheckValue(ref value, copyBack: ref _ref, binder, culture, invokeAttr);
 }

 Invoker.SetValue(obj, value);
 bool domainInitialized = false;
 if (declaringType is null)
 {
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 }
 }

 [DebuggerStepThrough]
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1185,7 +1185,6 @@ public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepa
 private object? m_d;
 private int m_b;
 private object? m_e;
 private object? m_f;
 private RuntimeFieldHandleInternal m_fieldHandle;
#pragma warning restore 414, 169

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/object.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,7 +1153,6 @@ class ReflectFieldObject : public BaseObjectWithCachedData
 INT32 m_empty2;
 OBJECTREF m_empty3;
 OBJECTREF m_empty4;
 OBJECTREF m_empty5;
 FieldDesc * m_pFD;

public:
Expand Down

3 changes: 1 addition & 2 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -617,7 +617,6 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClause.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClauseOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAccessor.cs" Condition="'$(FeatureNativeAot)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAttributes.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\GenericParameterAttributes.cs" />
Expand DownExpand Up@@ -2456,4 +2455,4 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
 </ItemGroup>
</Project>
</Project>

34 changes: 0 additions & 34 deletions
src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs

View file


Open in desktop


This file was deleted.


31 changes: 2 additions & 29 deletions
src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ internal abstract class RtFieldInfo : FieldInfo
 internal abstract object UnsafeGetValue(object obj);
 internal abstract void UnsafeSetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
 internal abstract void CheckConsistency(object target);
 internal abstract object? GetValueNonEmit(object? obj);
 internal abstract void SetValueNonEmit(object? obj, object? value);
 }

 [StructLayout(LayoutKind.Sequential)]
Expand All@@ -51,19 +49,8 @@ internal sealed class RuntimeFieldInfo : RtFieldInfo
 private string? name;
 private Type? type;
 private FieldAttributes attrs;
 private FieldAccessor? invoker;
#pragma warning restore 649

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 invoker ??= new FieldAccessor(this);
 return invoker;
 }
 }

 public override Module Module
 {
 get
Expand DownExpand Up@@ -128,13 +115,6 @@ public override void SetValueDirect(TypedReference obj, object value)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override void SetValueNonEmit(object? obj, object? value)
 {
 SetValueInternal(this, obj, value);
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 public override object GetValueDirect(TypedReference obj)
Expand All@@ -149,13 +129,6 @@ public override object GetValueDirect(TypedReference obj)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override object? GetValueNonEmit(object? obj)
 {
 return GetValueInternal(obj);
 }

 public override FieldAttributes Attributes
 {
 get
Expand DownExpand Up@@ -239,7 +212,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
 if (!IsLiteral)
 CheckGeneric();

 return Invoker.GetValue(obj);
 return GetValueInternal(obj);
 }

 public override string ToString()
Expand DownExpand Up@@ -278,7 +251,7 @@ public override void SetValue(object? obj, object? val, BindingFlags invokeAttr,
 }
 }

Invoker.SetValue(obj, val);
SetValueInternal(this, obj, val);
 }

 internal RuntimeFieldInfo Clone(string newName)
Expand Down

, '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); }
})();
})();
[release/7.0] For perf, remove Invoker pattern for fields by github-actions[bot] · Pull Request #74693 · dotnet/runtime · GitHub
Skip to content
[release/7.0] For perf, remove Invoker pattern for fields#74693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Aug 28, 2022
 Merged


[release/7.0] For perf, remove Invoker pattern for fields
#74693
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d2b3a61

For perf, remove Invoker pattern for fields


steveharter Aug 25, 2022
ed7e1e7

Fix up runtime field layout


steveharter Aug 26, 2022
d3054d1

Add missing newline


steveharter Aug 26, 2022

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


103 changes: 29 additions & 74 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,12 @@ internal sealed unsafe class RtFieldInfo : RuntimeFieldInfo, IRuntimeFieldInfo
 // lazy caching
 private string? m_name;
 private RuntimeType? m_fieldType;
 internal FieldAccessor? m_invoker;

 private InvocationFlags m_invocationFlags;
 internal InvocationFlags InvocationFlags
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get => (Invoker._invocationFlags & InvocationFlags.Initialized) != 0 ?
 Invoker._invocationFlags : InitializeInvocationFlags();
 }

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 m_invoker ??= new FieldAccessor(this);
 return m_invoker;
 }
 get => (m_invocationFlags & InvocationFlags.Initialized) != 0 ?
 m_invocationFlags : InitializeInvocationFlags();
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
Expand DownExpand Up@@ -67,7 +56,7 @@ private InvocationFlags InitializeInvocationFlags()
 }

 // must be last to avoid threading problems
 return Invoker._invocationFlags = invocationFlags | InvocationFlags.Initialized;
 return m_invocationFlags = invocationFlags | InvocationFlags.Initialized;
 }
 #endregion

Expand DownExpand Up@@ -113,63 +102,6 @@ internal override bool CacheEquals(object? o)
 return o is RtFieldInfo m && m.m_fieldHandle == m_fieldHandle;
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal object? GetValueNonEmit(object? obj)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal void SetValueNonEmit(object? obj, object? value)
 {
 RuntimeType? declaringType = DeclaringType as RuntimeType;
 RuntimeType fieldType = (RuntimeType)FieldType;
 bool domainInitialized = false;

 if (declaringType == null)
 {
 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType: null,
 ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;

 RuntimeFieldHandle.SetValue(
 this,
 obj,
 value,
 fieldType,
 Attributes,
 declaringType,
 ref domainInitialized);

 declaringType.DomainInitialized = domainInitialized;
 }
 }

 #endregion

 #region MemberInfo Overrides
Expand DownExpand Up@@ -211,7 +143,20 @@ public override int GetHashCode() =>

 CheckConsistency(obj);

 return Invoker.GetValue(obj);
 RuntimeType fieldType = (RuntimeType)FieldType;

 bool domainInitialized = false;
 if (declaringType == null)
 {
 return RuntimeFieldHandle.GetValue(this, obj, fieldType, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 object? retVal = RuntimeFieldHandle.GetValue(this, obj, fieldType, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 return retVal;
 }
 }

 public override object GetRawConstantValue() { throw new InvalidOperationException(); }
Expand DownExpand Up@@ -258,7 +203,17 @@ public override void SetValue(object? obj, object? value, BindingFlags invokeAtt
 fieldType.CheckValue(ref value, copyBack: ref _ref, binder, culture, invokeAttr);
 }

 Invoker.SetValue(obj, value);
 bool domainInitialized = false;
 if (declaringType is null)
 {
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, null, ref domainInitialized);
 }
 else
 {
 domainInitialized = declaringType.DomainInitialized;
 RuntimeFieldHandle.SetValue(this, obj, value, fieldType, m_fieldAttributes, declaringType, ref domainInitialized);
 declaringType.DomainInitialized = domainInitialized;
 }
 }

 [DebuggerStepThrough]
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1185,7 +1185,6 @@ public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepa
 private object? m_d;
 private int m_b;
 private object? m_e;
 private object? m_f;
 private RuntimeFieldHandleInternal m_fieldHandle;
#pragma warning restore 414, 169

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/object.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,7 +1153,6 @@ class ReflectFieldObject : public BaseObjectWithCachedData
 INT32 m_empty2;
 OBJECTREF m_empty3;
 OBJECTREF m_empty4;
 OBJECTREF m_empty5;
 FieldDesc * m_pFD;

public:
Expand Down

3 changes: 1 addition & 2 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -617,7 +617,6 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\EventInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClause.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ExceptionHandlingClauseOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAccessor.cs" Condition="'$(FeatureNativeAot)' != 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldAttributes.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\FieldInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\GenericParameterAttributes.cs" />
Expand DownExpand Up@@ -2456,4 +2455,4 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
 </ItemGroup>
</Project>
</Project>

34 changes: 0 additions & 34 deletions
src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs

View file


Open in desktop


This file was deleted.


31 changes: 2 additions & 29 deletions
src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ internal abstract class RtFieldInfo : FieldInfo
 internal abstract object UnsafeGetValue(object obj);
 internal abstract void UnsafeSetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
 internal abstract void CheckConsistency(object target);
 internal abstract object? GetValueNonEmit(object? obj);
 internal abstract void SetValueNonEmit(object? obj, object? value);
 }

 [StructLayout(LayoutKind.Sequential)]
Expand All@@ -51,19 +49,8 @@ internal sealed class RuntimeFieldInfo : RtFieldInfo
 private string? name;
 private Type? type;
 private FieldAttributes attrs;
 private FieldAccessor? invoker;
#pragma warning restore 649

 private FieldAccessor Invoker
 {
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 get
 {
 invoker ??= new FieldAccessor(this);
 return invoker;
 }
 }

 public override Module Module
 {
 get
Expand DownExpand Up@@ -128,13 +115,6 @@ public override void SetValueDirect(TypedReference obj, object value)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override void SetValueNonEmit(object? obj, object? value)
 {
 SetValueInternal(this, obj, value);
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 public override object GetValueDirect(TypedReference obj)
Expand All@@ -149,13 +129,6 @@ public override object GetValueDirect(TypedReference obj)
 }
 }

 [DebuggerStepThrough]
 [DebuggerHidden]
 internal override object? GetValueNonEmit(object? obj)
 {
 return GetValueInternal(obj);
 }

 public override FieldAttributes Attributes
 {
 get
Expand DownExpand Up@@ -239,7 +212,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
 if (!IsLiteral)
 CheckGeneric();

 return Invoker.GetValue(obj);
 return GetValueInternal(obj);
 }

 public override string ToString()
Expand DownExpand Up@@ -278,7 +251,7 @@ public override void SetValue(object? obj, object? val, BindingFlags invokeAttr,
 }
 }

Invoker.SetValue(obj, val);
SetValueInternal(this, obj, val);
 }

 internal RuntimeFieldInfo Clone(string newName)
Expand Down