Skip to content

Only create MethodTable optional fields when needed#79435

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
MichalStrehovsky merged 2 commits into from
Dec 10, 2022
Merged

Only create MethodTable optional fields when needed #79435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c953ca1
Only create MethodTable optional fields when needed
MichalStrehovsky Dec 9, 2022
ecf5f0d
Hmm
MichalStrehovsky Dec 9, 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
24 changes: 15 additions & 9 deletions src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -858,10 +858,13 @@ internal bool HasDispatchMap
if (NumInterfaces == 0)
return false;
byte* optionalFields = OptionalFieldsPtr;
if (optionalFields == null)
return false;
uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
if (idxDispatchMap == 0xffffffff)

const uint NoDispatchMap = 0xffffffff;
uint idxDispatchMap = NoDispatchMap;
if (optionalFields != null)
idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);

if (idxDispatchMap == NoDispatchMap)
{
if (IsDynamicType)
return DynamicTemplateType->HasDispatchMap;
Expand All@@ -878,12 +881,15 @@ internal DispatchMap* DispatchMap
if (NumInterfaces == 0)
return null;
byte* optionalFields = OptionalFieldsPtr;
if (optionalFields == null)
return null;
uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
if (idxDispatchMap == 0xffffffff && IsDynamicType)
const uint NoDispatchMap = 0xffffffff;
uint idxDispatchMap = NoDispatchMap;
if (optionalFields != null)
idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);
if (idxDispatchMap == NoDispatchMap)
{
return DynamicTemplateType->DispatchMap;
if (IsDynamicType)
return DynamicTemplateType->DispatchMap;
return null;
}

if (SupportsRelativePointers)
Expand Down
19 changes: 12 additions & 7 deletions ...eclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/EETypeCreator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,14 +217,18 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
if (state.ThreadDataSize != 0)
rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithThreadStatics;

optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);
if (rareFlags != 0)
optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);

// Dispatch map is fetched from template type
optionalFields.ClearField(EETypeOptionalFieldTag.DispatchMap);

// Compute size of optional fields encoding
cbOptionalFieldsSize = optionalFields.Encode();
Debug.Assert(cbOptionalFieldsSize > 0);

// Clear the optional fields flag. We'll set it if we set optional fields later in this method.
if (cbOptionalFieldsSize == 0)
flags &= ~(uint)EETypeFlags.OptionalFieldsFlag;

// Note: The number of vtable slots on the MethodTable to create is not necessary equal to the number of
// vtable slots on the template type for universal generics (see ComputeVTableLayout)
Expand All@@ -243,7 +247,7 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
numVtableSlots,
runtimeInterfacesLength,
hasFinalizer,
true,
cbOptionalFieldsSize > 0,
(rareFlags & (int)EETypeRareFlags.HasSealedVTableEntriesFlag) != 0,
isGeneric,
allocatedNonGCDataSize != 0,
Expand DownExpand Up@@ -278,10 +282,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
Debug.Assert(pEEType->HasGCPointers == (cbGCDesc != 0));

// Copy the encoded optional fields buffer to the newly allocated memory, and update the OptionalFields field on the MethodTable
// It is important to set the optional fields first on the newly created MethodTable, because all other 'setters'
// will assert that the type is dynamic, just to make sure we are not making any changes to statically compiled types
pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
if (cbOptionalFieldsSize > 0)
{
pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
}

// Copy VTable entries from template type
IntPtr* pVtable = (IntPtr*)((byte*)pEEType + sizeof(MethodTable));
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" + '
Only create MethodTable optional fields when needed by MichalStrehovsky · Pull Request #79435 · dotnet/runtime · GitHub
Skip to content
Only create MethodTable optional fields when needed#79435

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

MichalStrehovsky
merged 2 commits into

from

Dec 10, 2022
 Merged


Only create MethodTable optional fields when needed
#79435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c953ca1

Only create MethodTable optional fields when needed


MichalStrehovsky Dec 9, 2022
ecf5f0d

Hmm


MichalStrehovsky Dec 9, 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


24 changes: 15 additions & 9 deletions
src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,10 +858,13 @@ internal bool HasDispatchMap
 if (NumInterfaces == 0)
 return false;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return false;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff)

 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);

 if (idxDispatchMap == NoDispatchMap)
 {
 if (IsDynamicType)
 return DynamicTemplateType->HasDispatchMap;
Expand All@@ -878,12 +881,15 @@ internal DispatchMap* DispatchMap
 if (NumInterfaces == 0)
 return null;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return null;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff && IsDynamicType)
 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);
 if (idxDispatchMap == NoDispatchMap)
 {
 return DynamicTemplateType->DispatchMap;
 if (IsDynamicType)
 return DynamicTemplateType->DispatchMap;
 return null;
 }

 if (SupportsRelativePointers)
Expand Down

19 changes: 12 additions & 7 deletions
...eclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/EETypeCreator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,14 +217,18 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 if (state.ThreadDataSize != 0)
 rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithThreadStatics;

 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);
 if (rareFlags != 0)
 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);

 // Dispatch map is fetched from template type
 optionalFields.ClearField(EETypeOptionalFieldTag.DispatchMap);

 // Compute size of optional fields encoding
 cbOptionalFieldsSize = optionalFields.Encode();
 Debug.Assert(cbOptionalFieldsSize > 0);

 // Clear the optional fields flag. We'll set it if we set optional fields later in this method.
 if (cbOptionalFieldsSize == 0)
 flags &= ~(uint)EETypeFlags.OptionalFieldsFlag;

 // Note: The number of vtable slots on the MethodTable to create is not necessary equal to the number of
 // vtable slots on the template type for universal generics (see ComputeVTableLayout)
Expand All@@ -243,7 +247,7 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 numVtableSlots,
 runtimeInterfacesLength,
 hasFinalizer,
true,
cbOptionalFieldsSize > 0,
 (rareFlags & (int)EETypeRareFlags.HasSealedVTableEntriesFlag) != 0,
 isGeneric,
 allocatedNonGCDataSize != 0,
Expand DownExpand Up@@ -278,10 +282,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 Debug.Assert(pEEType->HasGCPointers == (cbGCDesc != 0));

 // Copy the encoded optional fields buffer to the newly allocated memory, and update the OptionalFields field on the MethodTable
 // It is important to set the optional fields first on the newly created MethodTable, because all other 'setters'
 // will assert that the type is dynamic, just to make sure we are not making any changes to statically compiled types
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 if (cbOptionalFieldsSize > 0)
 {
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 }

 // Copy VTable entries from template type
 IntPtr* pVtable = (IntPtr*)((byte*)pEEType + sizeof(MethodTable));
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('^' + ".*" + '
Only create MethodTable optional fields when needed by MichalStrehovsky · Pull Request #79435 · dotnet/runtime · GitHub
Skip to content
Only create MethodTable optional fields when needed#79435

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

MichalStrehovsky
merged 2 commits into

from

Dec 10, 2022
 Merged


Only create MethodTable optional fields when needed
#79435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c953ca1

Only create MethodTable optional fields when needed


MichalStrehovsky Dec 9, 2022
ecf5f0d

Hmm


MichalStrehovsky Dec 9, 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


24 changes: 15 additions & 9 deletions
src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,10 +858,13 @@ internal bool HasDispatchMap
 if (NumInterfaces == 0)
 return false;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return false;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff)

 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);

 if (idxDispatchMap == NoDispatchMap)
 {
 if (IsDynamicType)
 return DynamicTemplateType->HasDispatchMap;
Expand All@@ -878,12 +881,15 @@ internal DispatchMap* DispatchMap
 if (NumInterfaces == 0)
 return null;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return null;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff && IsDynamicType)
 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);
 if (idxDispatchMap == NoDispatchMap)
 {
 return DynamicTemplateType->DispatchMap;
 if (IsDynamicType)
 return DynamicTemplateType->DispatchMap;
 return null;
 }

 if (SupportsRelativePointers)
Expand Down

19 changes: 12 additions & 7 deletions
...eclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/EETypeCreator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,14 +217,18 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 if (state.ThreadDataSize != 0)
 rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithThreadStatics;

 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);
 if (rareFlags != 0)
 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);

 // Dispatch map is fetched from template type
 optionalFields.ClearField(EETypeOptionalFieldTag.DispatchMap);

 // Compute size of optional fields encoding
 cbOptionalFieldsSize = optionalFields.Encode();
 Debug.Assert(cbOptionalFieldsSize > 0);

 // Clear the optional fields flag. We'll set it if we set optional fields later in this method.
 if (cbOptionalFieldsSize == 0)
 flags &= ~(uint)EETypeFlags.OptionalFieldsFlag;

 // Note: The number of vtable slots on the MethodTable to create is not necessary equal to the number of
 // vtable slots on the template type for universal generics (see ComputeVTableLayout)
Expand All@@ -243,7 +247,7 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 numVtableSlots,
 runtimeInterfacesLength,
 hasFinalizer,
true,
cbOptionalFieldsSize > 0,
 (rareFlags & (int)EETypeRareFlags.HasSealedVTableEntriesFlag) != 0,
 isGeneric,
 allocatedNonGCDataSize != 0,
Expand DownExpand Up@@ -278,10 +282,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 Debug.Assert(pEEType->HasGCPointers == (cbGCDesc != 0));

 // Copy the encoded optional fields buffer to the newly allocated memory, and update the OptionalFields field on the MethodTable
 // It is important to set the optional fields first on the newly created MethodTable, because all other 'setters'
 // will assert that the type is dynamic, just to make sure we are not making any changes to statically compiled types
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 if (cbOptionalFieldsSize > 0)
 {
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 }

 // Copy VTable entries from template type
 IntPtr* pVtable = (IntPtr*)((byte*)pEEType + sizeof(MethodTable));
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('^' + ".*" + '
Only create MethodTable optional fields when needed by MichalStrehovsky · Pull Request #79435 · dotnet/runtime · GitHub
Skip to content
Only create MethodTable optional fields when needed#79435

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

MichalStrehovsky
merged 2 commits into

from

Dec 10, 2022
 Merged


Only create MethodTable optional fields when needed
#79435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c953ca1

Only create MethodTable optional fields when needed


MichalStrehovsky Dec 9, 2022
ecf5f0d

Hmm


MichalStrehovsky Dec 9, 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


24 changes: 15 additions & 9 deletions
src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,10 +858,13 @@ internal bool HasDispatchMap
 if (NumInterfaces == 0)
 return false;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return false;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff)

 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);

 if (idxDispatchMap == NoDispatchMap)
 {
 if (IsDynamicType)
 return DynamicTemplateType->HasDispatchMap;
Expand All@@ -878,12 +881,15 @@ internal DispatchMap* DispatchMap
 if (NumInterfaces == 0)
 return null;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return null;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff && IsDynamicType)
 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);
 if (idxDispatchMap == NoDispatchMap)
 {
 return DynamicTemplateType->DispatchMap;
 if (IsDynamicType)
 return DynamicTemplateType->DispatchMap;
 return null;
 }

 if (SupportsRelativePointers)
Expand Down

19 changes: 12 additions & 7 deletions
...eclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/EETypeCreator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,14 +217,18 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 if (state.ThreadDataSize != 0)
 rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithThreadStatics;

 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);
 if (rareFlags != 0)
 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);

 // Dispatch map is fetched from template type
 optionalFields.ClearField(EETypeOptionalFieldTag.DispatchMap);

 // Compute size of optional fields encoding
 cbOptionalFieldsSize = optionalFields.Encode();
 Debug.Assert(cbOptionalFieldsSize > 0);

 // Clear the optional fields flag. We'll set it if we set optional fields later in this method.
 if (cbOptionalFieldsSize == 0)
 flags &= ~(uint)EETypeFlags.OptionalFieldsFlag;

 // Note: The number of vtable slots on the MethodTable to create is not necessary equal to the number of
 // vtable slots on the template type for universal generics (see ComputeVTableLayout)
Expand All@@ -243,7 +247,7 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 numVtableSlots,
 runtimeInterfacesLength,
 hasFinalizer,
true,
cbOptionalFieldsSize > 0,
 (rareFlags & (int)EETypeRareFlags.HasSealedVTableEntriesFlag) != 0,
 isGeneric,
 allocatedNonGCDataSize != 0,
Expand DownExpand Up@@ -278,10 +282,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 Debug.Assert(pEEType->HasGCPointers == (cbGCDesc != 0));

 // Copy the encoded optional fields buffer to the newly allocated memory, and update the OptionalFields field on the MethodTable
 // It is important to set the optional fields first on the newly created MethodTable, because all other 'setters'
 // will assert that the type is dynamic, just to make sure we are not making any changes to statically compiled types
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 if (cbOptionalFieldsSize > 0)
 {
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 }

 // Copy VTable entries from template type
 IntPtr* pVtable = (IntPtr*)((byte*)pEEType + sizeof(MethodTable));
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" + '
Only create MethodTable optional fields when needed by MichalStrehovsky · Pull Request #79435 · dotnet/runtime · GitHub
Skip to content
Only create MethodTable optional fields when needed#79435

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

MichalStrehovsky
merged 2 commits into

from

Dec 10, 2022
 Merged


Only create MethodTable optional fields when needed
#79435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c953ca1

Only create MethodTable optional fields when needed


MichalStrehovsky Dec 9, 2022
ecf5f0d

Hmm


MichalStrehovsky Dec 9, 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


24 changes: 15 additions & 9 deletions
src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,10 +858,13 @@ internal bool HasDispatchMap
 if (NumInterfaces == 0)
 return false;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return false;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff)

 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);

 if (idxDispatchMap == NoDispatchMap)
 {
 if (IsDynamicType)
 return DynamicTemplateType->HasDispatchMap;
Expand All@@ -878,12 +881,15 @@ internal DispatchMap* DispatchMap
 if (NumInterfaces == 0)
 return null;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return null;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff && IsDynamicType)
 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);
 if (idxDispatchMap == NoDispatchMap)
 {
 return DynamicTemplateType->DispatchMap;
 if (IsDynamicType)
 return DynamicTemplateType->DispatchMap;
 return null;
 }

 if (SupportsRelativePointers)
Expand Down

19 changes: 12 additions & 7 deletions
...eclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/EETypeCreator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,14 +217,18 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 if (state.ThreadDataSize != 0)
 rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithThreadStatics;

 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);
 if (rareFlags != 0)
 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);

 // Dispatch map is fetched from template type
 optionalFields.ClearField(EETypeOptionalFieldTag.DispatchMap);

 // Compute size of optional fields encoding
 cbOptionalFieldsSize = optionalFields.Encode();
 Debug.Assert(cbOptionalFieldsSize > 0);

 // Clear the optional fields flag. We'll set it if we set optional fields later in this method.
 if (cbOptionalFieldsSize == 0)
 flags &= ~(uint)EETypeFlags.OptionalFieldsFlag;

 // Note: The number of vtable slots on the MethodTable to create is not necessary equal to the number of
 // vtable slots on the template type for universal generics (see ComputeVTableLayout)
Expand All@@ -243,7 +247,7 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 numVtableSlots,
 runtimeInterfacesLength,
 hasFinalizer,
true,
cbOptionalFieldsSize > 0,
 (rareFlags & (int)EETypeRareFlags.HasSealedVTableEntriesFlag) != 0,
 isGeneric,
 allocatedNonGCDataSize != 0,
Expand DownExpand Up@@ -278,10 +282,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 Debug.Assert(pEEType->HasGCPointers == (cbGCDesc != 0));

 // Copy the encoded optional fields buffer to the newly allocated memory, and update the OptionalFields field on the MethodTable
 // It is important to set the optional fields first on the newly created MethodTable, because all other 'setters'
 // will assert that the type is dynamic, just to make sure we are not making any changes to statically compiled types
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 if (cbOptionalFieldsSize > 0)
 {
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 }

 // Copy VTable entries from template type
 IntPtr* pVtable = (IntPtr*)((byte*)pEEType + sizeof(MethodTable));
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('^' + ".*" + '
Only create MethodTable optional fields when needed by MichalStrehovsky · Pull Request #79435 · dotnet/runtime · GitHub
Skip to content
Only create MethodTable optional fields when needed#79435

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

MichalStrehovsky
merged 2 commits into

from

Dec 10, 2022
 Merged


Only create MethodTable optional fields when needed
#79435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c953ca1

Only create MethodTable optional fields when needed


MichalStrehovsky Dec 9, 2022
ecf5f0d

Hmm


MichalStrehovsky Dec 9, 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


24 changes: 15 additions & 9 deletions
src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,10 +858,13 @@ internal bool HasDispatchMap
 if (NumInterfaces == 0)
 return false;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return false;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff)

 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);

 if (idxDispatchMap == NoDispatchMap)
 {
 if (IsDynamicType)
 return DynamicTemplateType->HasDispatchMap;
Expand All@@ -878,12 +881,15 @@ internal DispatchMap* DispatchMap
 if (NumInterfaces == 0)
 return null;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return null;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff && IsDynamicType)
 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);
 if (idxDispatchMap == NoDispatchMap)
 {
 return DynamicTemplateType->DispatchMap;
 if (IsDynamicType)
 return DynamicTemplateType->DispatchMap;
 return null;
 }

 if (SupportsRelativePointers)
Expand Down

19 changes: 12 additions & 7 deletions
...eclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/EETypeCreator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,14 +217,18 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 if (state.ThreadDataSize != 0)
 rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithThreadStatics;

 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);
 if (rareFlags != 0)
 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);

 // Dispatch map is fetched from template type
 optionalFields.ClearField(EETypeOptionalFieldTag.DispatchMap);

 // Compute size of optional fields encoding
 cbOptionalFieldsSize = optionalFields.Encode();
 Debug.Assert(cbOptionalFieldsSize > 0);

 // Clear the optional fields flag. We'll set it if we set optional fields later in this method.
 if (cbOptionalFieldsSize == 0)
 flags &= ~(uint)EETypeFlags.OptionalFieldsFlag;

 // Note: The number of vtable slots on the MethodTable to create is not necessary equal to the number of
 // vtable slots on the template type for universal generics (see ComputeVTableLayout)
Expand All@@ -243,7 +247,7 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 numVtableSlots,
 runtimeInterfacesLength,
 hasFinalizer,
true,
cbOptionalFieldsSize > 0,
 (rareFlags & (int)EETypeRareFlags.HasSealedVTableEntriesFlag) != 0,
 isGeneric,
 allocatedNonGCDataSize != 0,
Expand DownExpand Up@@ -278,10 +282,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 Debug.Assert(pEEType->HasGCPointers == (cbGCDesc != 0));

 // Copy the encoded optional fields buffer to the newly allocated memory, and update the OptionalFields field on the MethodTable
 // It is important to set the optional fields first on the newly created MethodTable, because all other 'setters'
 // will assert that the type is dynamic, just to make sure we are not making any changes to statically compiled types
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 if (cbOptionalFieldsSize > 0)
 {
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 }

 // Copy VTable entries from template type
 IntPtr* pVtable = (IntPtr*)((byte*)pEEType + sizeof(MethodTable));
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); }
})();
})();
Only create MethodTable optional fields when needed by MichalStrehovsky · Pull Request #79435 · dotnet/runtime · GitHub
Skip to content
Only create MethodTable optional fields when needed#79435

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

MichalStrehovsky
merged 2 commits into

from

Dec 10, 2022
 Merged


Only create MethodTable optional fields when needed
#79435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c953ca1

Only create MethodTable optional fields when needed


MichalStrehovsky Dec 9, 2022
ecf5f0d

Hmm


MichalStrehovsky Dec 9, 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


24 changes: 15 additions & 9 deletions
src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,10 +858,13 @@ internal bool HasDispatchMap
 if (NumInterfaces == 0)
 return false;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return false;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff)

 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);

 if (idxDispatchMap == NoDispatchMap)
 {
 if (IsDynamicType)
 return DynamicTemplateType->HasDispatchMap;
Expand All@@ -878,12 +881,15 @@ internal DispatchMap* DispatchMap
 if (NumInterfaces == 0)
 return null;
 byte* optionalFields = OptionalFieldsPtr;
 if (optionalFields == null)
 return null;
 uint idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, 0xffffffff);
 if (idxDispatchMap == 0xffffffff && IsDynamicType)
 const uint NoDispatchMap = 0xffffffff;
 uint idxDispatchMap = NoDispatchMap;
 if (optionalFields != null)
 idxDispatchMap = OptionalFieldsReader.GetInlineField(optionalFields, EETypeOptionalFieldTag.DispatchMap, NoDispatchMap);
 if (idxDispatchMap == NoDispatchMap)
 {
 return DynamicTemplateType->DispatchMap;
 if (IsDynamicType)
 return DynamicTemplateType->DispatchMap;
 return null;
 }

 if (SupportsRelativePointers)
Expand Down

19 changes: 12 additions & 7 deletions
...eclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/EETypeCreator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,14 +217,18 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 if (state.ThreadDataSize != 0)
 rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithThreadStatics;

 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);
 if (rareFlags != 0)
 optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);

 // Dispatch map is fetched from template type
 optionalFields.ClearField(EETypeOptionalFieldTag.DispatchMap);

 // Compute size of optional fields encoding
 cbOptionalFieldsSize = optionalFields.Encode();
 Debug.Assert(cbOptionalFieldsSize > 0);

 // Clear the optional fields flag. We'll set it if we set optional fields later in this method.
 if (cbOptionalFieldsSize == 0)
 flags &= ~(uint)EETypeFlags.OptionalFieldsFlag;

 // Note: The number of vtable slots on the MethodTable to create is not necessary equal to the number of
 // vtable slots on the template type for universal generics (see ComputeVTableLayout)
Expand All@@ -243,7 +247,7 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 numVtableSlots,
 runtimeInterfacesLength,
 hasFinalizer,
true,
cbOptionalFieldsSize > 0,
 (rareFlags & (int)EETypeRareFlags.HasSealedVTableEntriesFlag) != 0,
 isGeneric,
 allocatedNonGCDataSize != 0,
Expand DownExpand Up@@ -278,10 +282,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
 Debug.Assert(pEEType->HasGCPointers == (cbGCDesc != 0));

 // Copy the encoded optional fields buffer to the newly allocated memory, and update the OptionalFields field on the MethodTable
 // It is important to set the optional fields first on the newly created MethodTable, because all other 'setters'
 // will assert that the type is dynamic, just to make sure we are not making any changes to statically compiled types
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 if (cbOptionalFieldsSize > 0)
 {
 pEEType->OptionalFieldsPtr = (byte*)pEEType + cbEEType;
 optionalFields.WriteToEEType(pEEType, cbOptionalFieldsSize);
 }

 // Copy VTable entries from template type
 IntPtr* pVtable = (IntPtr*)((byte*)pEEType + sizeof(MethodTable));
Expand Down