#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api#104989

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
davidwrighton merged 2 commits into from
Jul 17, 2024
Merged

#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api #104989

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
d6f50f7
#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api
davidwrighton Jul 16, 2024
0427146
Merge branch 'main' into Remove_GetMethodDescForSlot
davidwrighton Jul 16, 2024
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
2 changes: 2 additions & 0 deletions src/coreclr/vm/classcompat.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,7 @@ class MethodTableBuilder

DispatchMapBuilder *pDispatchMapBuilder;

#ifndef DACCESS_COMPILE
MethodDesc* GetMethodDescForSlot(WORD slot)
{
CONTRACTL
Expand All@@ -365,6 +366,7 @@ class MethodTableBuilder
(MethodTable::GetMethodDescForSlotAddress(pVtable[slot]) == pVtableMD[slot]));
return pVtableMD[slot];
}
#endif // DACCESS_COMPILE

void SetMethodDescForSlot(WORD slot, MethodDesc* pMD)
{
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/vm/method.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ LPCUTF8 MethodDesc::GetNameThrowing()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
LPCUTF8 MethodDesc::GetName(USHORT slot)
{
// MethodDesc::GetDeclMethodDesc can throw.
Expand All@@ -293,6 +294,7 @@ LPCUTF8 MethodDesc::GetName(USHORT slot)
CONSISTENCY_CHECK(IsInterface() || !pDeclMD->IsInterface());
return pDeclMD->GetName();
}
#endif // DACCESS_COMPILE

//*******************************************************************************
LPCUTF8 MethodDesc::GetName()
Expand DownExpand Up@@ -590,6 +592,7 @@ PTR_PCODE MethodDesc::GetAddrOfSlot()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
{
CONTRACTL {
Expand DownExpand Up@@ -642,6 +645,7 @@ PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
CONSISTENCY_CHECK((UINT32)pMDResult->GetSlot() == slotNumber);
return PTR_MethodDesc(pMDResult);
}
#endif // DACCESS_COMPILE

//*******************************************************************************
// Returns a hash for the method.
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/vm/method.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -333,7 +333,9 @@ class MethodDesc
// See the TypeString class for better control over name formatting.
LPCUTF8 GetName();

#ifndef DACCESS_COMPILE
LPCUTF8 GetName(USHORT slot);
#endif // DACCESS_COMPILE

LPCUTF8 GetNameThrowing();

Expand DownExpand Up@@ -1053,7 +1055,9 @@ class MethodDesc

PTR_PCODE GetAddrOfSlot();

#ifndef DACCESS_COMPILE
PTR_MethodDesc GetDeclMethodDesc(UINT32 slotNumber);
#endif // DACCESS_COMPILE

public:
mdMethodDef GetMemberDef() const;
Expand Down
35 changes: 0 additions & 35 deletions src/coreclr/vm/methodtable.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5857,41 +5857,6 @@ bool MethodTable::DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, Me
return intIt.CurrentInterfaceMatches(this, pMT);
}

//==========================================================================================
MethodDesc * MethodTable::GetIntroducingMethodDesc(DWORD slotNumber)
{
CONTRACTL
{
NOTHROW;
GC_NOTRIGGER;
MODE_ANY;
}
CONTRACTL_END;

MethodDesc * pCurrentMD = GetMethodDescForSlot(slotNumber);
DWORD dwSlot = pCurrentMD->GetSlot();
MethodDesc * pIntroducingMD = NULL;

MethodTable * pParentType = GetParentMethodTable();
MethodTable * pPrevParentType = NULL;

// Find this method in the parent.
// If it does exist in the parent, it would be at the same vtable slot.
while ((pParentType != NULL) &&
(dwSlot < pParentType->GetNumVirtuals()))
{
pPrevParentType = pParentType;
pParentType = pParentType->GetParentMethodTable();
}

if (pPrevParentType != NULL)
{
pIntroducingMD = pPrevParentType->GetMethodDescForSlot(dwSlot);
}

return pIntroducingMD;
}

//==========================================================================================
// There is a case where a method declared in a type can be explicitly
// overridden by a methodImpl on another method within the same type. In
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/methodtable.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1671,11 +1671,13 @@ class MethodTable
// Slots <-> the MethodDesc associated with the slot.
//

#ifndef DACCESS_COMPILE
// Get the MethodDesc that implements a given slot
// NOTE: Since this may fill in the slot with a temporary entrypoint if that hasn't happened
// yet, when writing asserts, GetMethodDescForSlot_NoThrow should be used to avoid
// the presence of an assert hiding bugs.
MethodDesc* GetMethodDescForSlot(DWORD slot);
#endif

// This api produces the same result as GetMethodDescForSlot, but it uses a variation on the
// algorithm that does not allocate a temporary entrypoint for the slot if it doesn't exist.
Expand DownExpand Up@@ -2434,8 +2436,6 @@ class MethodTable
MethodTable *LookupDispatchMapType(DispatchMapTypeID typeID);
bool DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, MethodTable* pMT);

MethodDesc *GetIntroducingMethodDesc(DWORD slotNumber);

// Determines whether all methods in the given interface have their final implementing
// slot in a parent class. I.e. if this returns TRUE, it is trivial (no VSD lookup) to
// dispatch pItfMT methods on this class if one knows how to dispatch them on pParentMT.
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/vm/methodtable.inl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -404,6 +404,7 @@ inline BOOL MethodTable::HasLayout()
}

//==========================================================================================
#ifndef DACCESS_COMPILE
inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)
{
CONTRACTL
Expand All@@ -425,6 +426,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)

return MethodTable::GetMethodDescForSlotAddress(pCode);
}
#endif // DACCESS_COMPILE

//==========================================================================================
inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot)
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/vm/methodtablebuilder.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2265,7 +2265,6 @@ class MethodTableBuilder
inline BOOL IsMethodImpl();
inline MethodClassification MethodType();
inline bmtMDMethod *GetMDMethod() const;
inline MethodDesc *GetIntroducingMethodDesc();
inline bmtMDMethod * operator->();
inline bmtMDMethod * operator*() { WRAPPER_NO_CONTRACT; return GetMDMethod(); }
}; // class DeclaredMethodIterator
Expand Down
32 changes: 0 additions & 32 deletions src/coreclr/vm/methodtablebuilder.inl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,6 @@ MethodTableBuilder::DeclaredMethodIterator::GetMDMethod() const
return m_declaredMethods[m_idx];
}

//*******************************************************************************
inline class MethodDesc *
MethodTableBuilder::DeclaredMethodIterator::GetIntroducingMethodDesc()
{
STANDARD_VM_CONTRACT;

bmtMDMethod *pCurrentMD = GetMDMethod();
DWORD dwSlot = pCurrentMD->GetSlotIndex();
MethodDesc *pIntroducingMD = NULL;

bmtRTType *pParentType = pCurrentMD->GetOwningType()->GetParentType();
bmtRTType *pPrevParentType = NULL;

// Find this method in the parent.
// If it does exist in the parent, it would be at the same vtable slot.
while (pParentType != NULL &&
dwSlot < pParentType->GetMethodTable()->GetNumVirtuals())
{
pPrevParentType = pParentType;
pParentType = pParentType->GetParentType();
}

if (pPrevParentType != NULL)
{
pIntroducingMD =
pPrevParentType->GetMethodTable()->GetMethodDescForSlot(dwSlot);
}

return pIntroducingMD;
}


//***************************************************************************************
inline MethodTableBuilder::bmtMDMethod *
MethodTableBuilder::DeclaredMethodIterator::operator->()
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" + '

Skip to content
#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api#104989

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

davidwrighton
merged 2 commits into

from

Jul 17, 2024
 Merged


#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api
#104989
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
d6f50f7

#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api


davidwrighton Jul 16, 2024
0427146

Merge branch 'main' into Remove_GetMethodDescForSlot


davidwrighton Jul 16, 2024

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


2 changes: 2 additions & 0 deletions
src/coreclr/vm/classcompat.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,7 @@ class MethodTableBuilder

 DispatchMapBuilder *pDispatchMapBuilder;

#ifndef DACCESS_COMPILE
 MethodDesc* GetMethodDescForSlot(WORD slot)
 {
 CONTRACTL
Expand All@@ -365,6 +366,7 @@ class MethodTableBuilder
 (MethodTable::GetMethodDescForSlotAddress(pVtable[slot]) == pVtableMD[slot]));
 return pVtableMD[slot];
 }
#endif // DACCESS_COMPILE

 void SetMethodDescForSlot(WORD slot, MethodDesc* pMD)
 {
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ LPCUTF8 MethodDesc::GetNameThrowing()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
LPCUTF8 MethodDesc::GetName(USHORT slot)
{
 // MethodDesc::GetDeclMethodDesc can throw.
Expand All@@ -293,6 +294,7 @@ LPCUTF8 MethodDesc::GetName(USHORT slot)
 CONSISTENCY_CHECK(IsInterface() || !pDeclMD->IsInterface());
 return pDeclMD->GetName();
}
#endif // DACCESS_COMPILE

//*******************************************************************************
LPCUTF8 MethodDesc::GetName()
Expand DownExpand Up@@ -590,6 +592,7 @@ PTR_PCODE MethodDesc::GetAddrOfSlot()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
{
 CONTRACTL {
Expand DownExpand Up@@ -642,6 +645,7 @@ PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
 CONSISTENCY_CHECK((UINT32)pMDResult->GetSlot() == slotNumber);
 return PTR_MethodDesc(pMDResult);
}
#endif // DACCESS_COMPILE

//*******************************************************************************
// Returns a hash for the method.
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -333,7 +333,9 @@ class MethodDesc
 // See the TypeString class for better control over name formatting.
 LPCUTF8 GetName();

#ifndef DACCESS_COMPILE
 LPCUTF8 GetName(USHORT slot);
#endif // DACCESS_COMPILE

 LPCUTF8 GetNameThrowing();

Expand DownExpand Up@@ -1053,7 +1055,9 @@ class MethodDesc

 PTR_PCODE GetAddrOfSlot();

#ifndef DACCESS_COMPILE
 PTR_MethodDesc GetDeclMethodDesc(UINT32 slotNumber);
#endif // DACCESS_COMPILE

public:
 mdMethodDef GetMemberDef() const;
Expand Down

35 changes: 0 additions & 35 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5857,41 +5857,6 @@ bool MethodTable::DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, Me
 return intIt.CurrentInterfaceMatches(this, pMT);
}

//==========================================================================================
MethodDesc * MethodTable::GetIntroducingMethodDesc(DWORD slotNumber)
{
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_ANY;
 }
 CONTRACTL_END;

 MethodDesc * pCurrentMD = GetMethodDescForSlot(slotNumber);
 DWORD dwSlot = pCurrentMD->GetSlot();
 MethodDesc * pIntroducingMD = NULL;

 MethodTable * pParentType = GetParentMethodTable();
 MethodTable * pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while ((pParentType != NULL) &&
 (dwSlot < pParentType->GetNumVirtuals()))
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentMethodTable();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD = pPrevParentType->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}

//==========================================================================================
// There is a case where a method declared in a type can be explicitly
// overridden by a methodImpl on another method within the same type. In
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/methodtable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1671,11 +1671,13 @@ class MethodTable
 // Slots <-> the MethodDesc associated with the slot.
 //

#ifndef DACCESS_COMPILE
 // Get the MethodDesc that implements a given slot
 // NOTE: Since this may fill in the slot with a temporary entrypoint if that hasn't happened
 // yet, when writing asserts, GetMethodDescForSlot_NoThrow should be used to avoid
 // the presence of an assert hiding bugs.
 MethodDesc* GetMethodDescForSlot(DWORD slot);
#endif

 // This api produces the same result as GetMethodDescForSlot, but it uses a variation on the
 // algorithm that does not allocate a temporary entrypoint for the slot if it doesn't exist.
Expand DownExpand Up@@ -2434,8 +2436,6 @@ class MethodTable
 MethodTable *LookupDispatchMapType(DispatchMapTypeID typeID);
 bool DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, MethodTable* pMT);

 MethodDesc *GetIntroducingMethodDesc(DWORD slotNumber);

 // Determines whether all methods in the given interface have their final implementing
 // slot in a parent class. I.e. if this returns TRUE, it is trivial (no VSD lookup) to
 // dispatch pItfMT methods on this class if one knows how to dispatch them on pParentMT.
Expand Down

2 changes: 2 additions & 0 deletions
src/coreclr/vm/methodtable.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,6 +404,7 @@ inline BOOL MethodTable::HasLayout()
}

//==========================================================================================
#ifndef DACCESS_COMPILE
inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)
{
 CONTRACTL
Expand All@@ -425,6 +426,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)

 return MethodTable::GetMethodDescForSlotAddress(pCode);
}
#endif // DACCESS_COMPILE

//==========================================================================================
inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2265,7 +2265,6 @@ class MethodTableBuilder
 inline BOOL IsMethodImpl();
 inline MethodClassification MethodType();
 inline bmtMDMethod *GetMDMethod() const;
 inline MethodDesc *GetIntroducingMethodDesc();
 inline bmtMDMethod * operator->();
 inline bmtMDMethod * operator*() { WRAPPER_NO_CONTRACT; return GetMDMethod(); }
 }; // class DeclaredMethodIterator
Expand Down

32 changes: 0 additions & 32 deletions
src/coreclr/vm/methodtablebuilder.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,6 @@ MethodTableBuilder::DeclaredMethodIterator::GetMDMethod() const
 return m_declaredMethods[m_idx];
}

//*******************************************************************************
inline class MethodDesc *
MethodTableBuilder::DeclaredMethodIterator::GetIntroducingMethodDesc()
{
 STANDARD_VM_CONTRACT;

 bmtMDMethod *pCurrentMD = GetMDMethod();
 DWORD dwSlot = pCurrentMD->GetSlotIndex();
 MethodDesc *pIntroducingMD = NULL;

 bmtRTType *pParentType = pCurrentMD->GetOwningType()->GetParentType();
 bmtRTType *pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while (pParentType != NULL &&
 dwSlot < pParentType->GetMethodTable()->GetNumVirtuals())
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentType();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD =
 pPrevParentType->GetMethodTable()->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}


//***************************************************************************************
inline MethodTableBuilder::bmtMDMethod *
MethodTableBuilder::DeclaredMethodIterator::operator->()
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('^' + ".*" + '

Skip to content
#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api#104989

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

davidwrighton
merged 2 commits into

from

Jul 17, 2024
 Merged


#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api
#104989
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
d6f50f7

#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api


davidwrighton Jul 16, 2024
0427146

Merge branch 'main' into Remove_GetMethodDescForSlot


davidwrighton Jul 16, 2024

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


2 changes: 2 additions & 0 deletions
src/coreclr/vm/classcompat.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,7 @@ class MethodTableBuilder

 DispatchMapBuilder *pDispatchMapBuilder;

#ifndef DACCESS_COMPILE
 MethodDesc* GetMethodDescForSlot(WORD slot)
 {
 CONTRACTL
Expand All@@ -365,6 +366,7 @@ class MethodTableBuilder
 (MethodTable::GetMethodDescForSlotAddress(pVtable[slot]) == pVtableMD[slot]));
 return pVtableMD[slot];
 }
#endif // DACCESS_COMPILE

 void SetMethodDescForSlot(WORD slot, MethodDesc* pMD)
 {
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ LPCUTF8 MethodDesc::GetNameThrowing()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
LPCUTF8 MethodDesc::GetName(USHORT slot)
{
 // MethodDesc::GetDeclMethodDesc can throw.
Expand All@@ -293,6 +294,7 @@ LPCUTF8 MethodDesc::GetName(USHORT slot)
 CONSISTENCY_CHECK(IsInterface() || !pDeclMD->IsInterface());
 return pDeclMD->GetName();
}
#endif // DACCESS_COMPILE

//*******************************************************************************
LPCUTF8 MethodDesc::GetName()
Expand DownExpand Up@@ -590,6 +592,7 @@ PTR_PCODE MethodDesc::GetAddrOfSlot()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
{
 CONTRACTL {
Expand DownExpand Up@@ -642,6 +645,7 @@ PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
 CONSISTENCY_CHECK((UINT32)pMDResult->GetSlot() == slotNumber);
 return PTR_MethodDesc(pMDResult);
}
#endif // DACCESS_COMPILE

//*******************************************************************************
// Returns a hash for the method.
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -333,7 +333,9 @@ class MethodDesc
 // See the TypeString class for better control over name formatting.
 LPCUTF8 GetName();

#ifndef DACCESS_COMPILE
 LPCUTF8 GetName(USHORT slot);
#endif // DACCESS_COMPILE

 LPCUTF8 GetNameThrowing();

Expand DownExpand Up@@ -1053,7 +1055,9 @@ class MethodDesc

 PTR_PCODE GetAddrOfSlot();

#ifndef DACCESS_COMPILE
 PTR_MethodDesc GetDeclMethodDesc(UINT32 slotNumber);
#endif // DACCESS_COMPILE

public:
 mdMethodDef GetMemberDef() const;
Expand Down

35 changes: 0 additions & 35 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5857,41 +5857,6 @@ bool MethodTable::DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, Me
 return intIt.CurrentInterfaceMatches(this, pMT);
}

//==========================================================================================
MethodDesc * MethodTable::GetIntroducingMethodDesc(DWORD slotNumber)
{
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_ANY;
 }
 CONTRACTL_END;

 MethodDesc * pCurrentMD = GetMethodDescForSlot(slotNumber);
 DWORD dwSlot = pCurrentMD->GetSlot();
 MethodDesc * pIntroducingMD = NULL;

 MethodTable * pParentType = GetParentMethodTable();
 MethodTable * pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while ((pParentType != NULL) &&
 (dwSlot < pParentType->GetNumVirtuals()))
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentMethodTable();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD = pPrevParentType->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}

//==========================================================================================
// There is a case where a method declared in a type can be explicitly
// overridden by a methodImpl on another method within the same type. In
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/methodtable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1671,11 +1671,13 @@ class MethodTable
 // Slots <-> the MethodDesc associated with the slot.
 //

#ifndef DACCESS_COMPILE
 // Get the MethodDesc that implements a given slot
 // NOTE: Since this may fill in the slot with a temporary entrypoint if that hasn't happened
 // yet, when writing asserts, GetMethodDescForSlot_NoThrow should be used to avoid
 // the presence of an assert hiding bugs.
 MethodDesc* GetMethodDescForSlot(DWORD slot);
#endif

 // This api produces the same result as GetMethodDescForSlot, but it uses a variation on the
 // algorithm that does not allocate a temporary entrypoint for the slot if it doesn't exist.
Expand DownExpand Up@@ -2434,8 +2436,6 @@ class MethodTable
 MethodTable *LookupDispatchMapType(DispatchMapTypeID typeID);
 bool DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, MethodTable* pMT);

 MethodDesc *GetIntroducingMethodDesc(DWORD slotNumber);

 // Determines whether all methods in the given interface have their final implementing
 // slot in a parent class. I.e. if this returns TRUE, it is trivial (no VSD lookup) to
 // dispatch pItfMT methods on this class if one knows how to dispatch them on pParentMT.
Expand Down

2 changes: 2 additions & 0 deletions
src/coreclr/vm/methodtable.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,6 +404,7 @@ inline BOOL MethodTable::HasLayout()
}

//==========================================================================================
#ifndef DACCESS_COMPILE
inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)
{
 CONTRACTL
Expand All@@ -425,6 +426,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)

 return MethodTable::GetMethodDescForSlotAddress(pCode);
}
#endif // DACCESS_COMPILE

//==========================================================================================
inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2265,7 +2265,6 @@ class MethodTableBuilder
 inline BOOL IsMethodImpl();
 inline MethodClassification MethodType();
 inline bmtMDMethod *GetMDMethod() const;
 inline MethodDesc *GetIntroducingMethodDesc();
 inline bmtMDMethod * operator->();
 inline bmtMDMethod * operator*() { WRAPPER_NO_CONTRACT; return GetMDMethod(); }
 }; // class DeclaredMethodIterator
Expand Down

32 changes: 0 additions & 32 deletions
src/coreclr/vm/methodtablebuilder.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,6 @@ MethodTableBuilder::DeclaredMethodIterator::GetMDMethod() const
 return m_declaredMethods[m_idx];
}

//*******************************************************************************
inline class MethodDesc *
MethodTableBuilder::DeclaredMethodIterator::GetIntroducingMethodDesc()
{
 STANDARD_VM_CONTRACT;

 bmtMDMethod *pCurrentMD = GetMDMethod();
 DWORD dwSlot = pCurrentMD->GetSlotIndex();
 MethodDesc *pIntroducingMD = NULL;

 bmtRTType *pParentType = pCurrentMD->GetOwningType()->GetParentType();
 bmtRTType *pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while (pParentType != NULL &&
 dwSlot < pParentType->GetMethodTable()->GetNumVirtuals())
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentType();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD =
 pPrevParentType->GetMethodTable()->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}


//***************************************************************************************
inline MethodTableBuilder::bmtMDMethod *
MethodTableBuilder::DeclaredMethodIterator::operator->()
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('^' + ".*" + '

Skip to content
#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api#104989

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

davidwrighton
merged 2 commits into

from

Jul 17, 2024
 Merged


#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api
#104989
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
d6f50f7

#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api


davidwrighton Jul 16, 2024
0427146

Merge branch 'main' into Remove_GetMethodDescForSlot


davidwrighton Jul 16, 2024

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


2 changes: 2 additions & 0 deletions
src/coreclr/vm/classcompat.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,7 @@ class MethodTableBuilder

 DispatchMapBuilder *pDispatchMapBuilder;

#ifndef DACCESS_COMPILE
 MethodDesc* GetMethodDescForSlot(WORD slot)
 {
 CONTRACTL
Expand All@@ -365,6 +366,7 @@ class MethodTableBuilder
 (MethodTable::GetMethodDescForSlotAddress(pVtable[slot]) == pVtableMD[slot]));
 return pVtableMD[slot];
 }
#endif // DACCESS_COMPILE

 void SetMethodDescForSlot(WORD slot, MethodDesc* pMD)
 {
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ LPCUTF8 MethodDesc::GetNameThrowing()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
LPCUTF8 MethodDesc::GetName(USHORT slot)
{
 // MethodDesc::GetDeclMethodDesc can throw.
Expand All@@ -293,6 +294,7 @@ LPCUTF8 MethodDesc::GetName(USHORT slot)
 CONSISTENCY_CHECK(IsInterface() || !pDeclMD->IsInterface());
 return pDeclMD->GetName();
}
#endif // DACCESS_COMPILE

//*******************************************************************************
LPCUTF8 MethodDesc::GetName()
Expand DownExpand Up@@ -590,6 +592,7 @@ PTR_PCODE MethodDesc::GetAddrOfSlot()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
{
 CONTRACTL {
Expand DownExpand Up@@ -642,6 +645,7 @@ PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
 CONSISTENCY_CHECK((UINT32)pMDResult->GetSlot() == slotNumber);
 return PTR_MethodDesc(pMDResult);
}
#endif // DACCESS_COMPILE

//*******************************************************************************
// Returns a hash for the method.
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -333,7 +333,9 @@ class MethodDesc
 // See the TypeString class for better control over name formatting.
 LPCUTF8 GetName();

#ifndef DACCESS_COMPILE
 LPCUTF8 GetName(USHORT slot);
#endif // DACCESS_COMPILE

 LPCUTF8 GetNameThrowing();

Expand DownExpand Up@@ -1053,7 +1055,9 @@ class MethodDesc

 PTR_PCODE GetAddrOfSlot();

#ifndef DACCESS_COMPILE
 PTR_MethodDesc GetDeclMethodDesc(UINT32 slotNumber);
#endif // DACCESS_COMPILE

public:
 mdMethodDef GetMemberDef() const;
Expand Down

35 changes: 0 additions & 35 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5857,41 +5857,6 @@ bool MethodTable::DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, Me
 return intIt.CurrentInterfaceMatches(this, pMT);
}

//==========================================================================================
MethodDesc * MethodTable::GetIntroducingMethodDesc(DWORD slotNumber)
{
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_ANY;
 }
 CONTRACTL_END;

 MethodDesc * pCurrentMD = GetMethodDescForSlot(slotNumber);
 DWORD dwSlot = pCurrentMD->GetSlot();
 MethodDesc * pIntroducingMD = NULL;

 MethodTable * pParentType = GetParentMethodTable();
 MethodTable * pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while ((pParentType != NULL) &&
 (dwSlot < pParentType->GetNumVirtuals()))
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentMethodTable();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD = pPrevParentType->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}

//==========================================================================================
// There is a case where a method declared in a type can be explicitly
// overridden by a methodImpl on another method within the same type. In
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/methodtable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1671,11 +1671,13 @@ class MethodTable
 // Slots <-> the MethodDesc associated with the slot.
 //

#ifndef DACCESS_COMPILE
 // Get the MethodDesc that implements a given slot
 // NOTE: Since this may fill in the slot with a temporary entrypoint if that hasn't happened
 // yet, when writing asserts, GetMethodDescForSlot_NoThrow should be used to avoid
 // the presence of an assert hiding bugs.
 MethodDesc* GetMethodDescForSlot(DWORD slot);
#endif

 // This api produces the same result as GetMethodDescForSlot, but it uses a variation on the
 // algorithm that does not allocate a temporary entrypoint for the slot if it doesn't exist.
Expand DownExpand Up@@ -2434,8 +2436,6 @@ class MethodTable
 MethodTable *LookupDispatchMapType(DispatchMapTypeID typeID);
 bool DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, MethodTable* pMT);

 MethodDesc *GetIntroducingMethodDesc(DWORD slotNumber);

 // Determines whether all methods in the given interface have their final implementing
 // slot in a parent class. I.e. if this returns TRUE, it is trivial (no VSD lookup) to
 // dispatch pItfMT methods on this class if one knows how to dispatch them on pParentMT.
Expand Down

2 changes: 2 additions & 0 deletions
src/coreclr/vm/methodtable.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,6 +404,7 @@ inline BOOL MethodTable::HasLayout()
}

//==========================================================================================
#ifndef DACCESS_COMPILE
inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)
{
 CONTRACTL
Expand All@@ -425,6 +426,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)

 return MethodTable::GetMethodDescForSlotAddress(pCode);
}
#endif // DACCESS_COMPILE

//==========================================================================================
inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2265,7 +2265,6 @@ class MethodTableBuilder
 inline BOOL IsMethodImpl();
 inline MethodClassification MethodType();
 inline bmtMDMethod *GetMDMethod() const;
 inline MethodDesc *GetIntroducingMethodDesc();
 inline bmtMDMethod * operator->();
 inline bmtMDMethod * operator*() { WRAPPER_NO_CONTRACT; return GetMDMethod(); }
 }; // class DeclaredMethodIterator
Expand Down

32 changes: 0 additions & 32 deletions
src/coreclr/vm/methodtablebuilder.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,6 @@ MethodTableBuilder::DeclaredMethodIterator::GetMDMethod() const
 return m_declaredMethods[m_idx];
}

//*******************************************************************************
inline class MethodDesc *
MethodTableBuilder::DeclaredMethodIterator::GetIntroducingMethodDesc()
{
 STANDARD_VM_CONTRACT;

 bmtMDMethod *pCurrentMD = GetMDMethod();
 DWORD dwSlot = pCurrentMD->GetSlotIndex();
 MethodDesc *pIntroducingMD = NULL;

 bmtRTType *pParentType = pCurrentMD->GetOwningType()->GetParentType();
 bmtRTType *pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while (pParentType != NULL &&
 dwSlot < pParentType->GetMethodTable()->GetNumVirtuals())
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentType();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD =
 pPrevParentType->GetMethodTable()->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}


//***************************************************************************************
inline MethodTableBuilder::bmtMDMethod *
MethodTableBuilder::DeclaredMethodIterator::operator->()
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" + '

Skip to content
#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api#104989

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

davidwrighton
merged 2 commits into

from

Jul 17, 2024
 Merged


#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api
#104989
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
d6f50f7

#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api


davidwrighton Jul 16, 2024
0427146

Merge branch 'main' into Remove_GetMethodDescForSlot


davidwrighton Jul 16, 2024

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


2 changes: 2 additions & 0 deletions
src/coreclr/vm/classcompat.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,7 @@ class MethodTableBuilder

 DispatchMapBuilder *pDispatchMapBuilder;

#ifndef DACCESS_COMPILE
 MethodDesc* GetMethodDescForSlot(WORD slot)
 {
 CONTRACTL
Expand All@@ -365,6 +366,7 @@ class MethodTableBuilder
 (MethodTable::GetMethodDescForSlotAddress(pVtable[slot]) == pVtableMD[slot]));
 return pVtableMD[slot];
 }
#endif // DACCESS_COMPILE

 void SetMethodDescForSlot(WORD slot, MethodDesc* pMD)
 {
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ LPCUTF8 MethodDesc::GetNameThrowing()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
LPCUTF8 MethodDesc::GetName(USHORT slot)
{
 // MethodDesc::GetDeclMethodDesc can throw.
Expand All@@ -293,6 +294,7 @@ LPCUTF8 MethodDesc::GetName(USHORT slot)
 CONSISTENCY_CHECK(IsInterface() || !pDeclMD->IsInterface());
 return pDeclMD->GetName();
}
#endif // DACCESS_COMPILE

//*******************************************************************************
LPCUTF8 MethodDesc::GetName()
Expand DownExpand Up@@ -590,6 +592,7 @@ PTR_PCODE MethodDesc::GetAddrOfSlot()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
{
 CONTRACTL {
Expand DownExpand Up@@ -642,6 +645,7 @@ PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
 CONSISTENCY_CHECK((UINT32)pMDResult->GetSlot() == slotNumber);
 return PTR_MethodDesc(pMDResult);
}
#endif // DACCESS_COMPILE

//*******************************************************************************
// Returns a hash for the method.
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -333,7 +333,9 @@ class MethodDesc
 // See the TypeString class for better control over name formatting.
 LPCUTF8 GetName();

#ifndef DACCESS_COMPILE
 LPCUTF8 GetName(USHORT slot);
#endif // DACCESS_COMPILE

 LPCUTF8 GetNameThrowing();

Expand DownExpand Up@@ -1053,7 +1055,9 @@ class MethodDesc

 PTR_PCODE GetAddrOfSlot();

#ifndef DACCESS_COMPILE
 PTR_MethodDesc GetDeclMethodDesc(UINT32 slotNumber);
#endif // DACCESS_COMPILE

public:
 mdMethodDef GetMemberDef() const;
Expand Down

35 changes: 0 additions & 35 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5857,41 +5857,6 @@ bool MethodTable::DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, Me
 return intIt.CurrentInterfaceMatches(this, pMT);
}

//==========================================================================================
MethodDesc * MethodTable::GetIntroducingMethodDesc(DWORD slotNumber)
{
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_ANY;
 }
 CONTRACTL_END;

 MethodDesc * pCurrentMD = GetMethodDescForSlot(slotNumber);
 DWORD dwSlot = pCurrentMD->GetSlot();
 MethodDesc * pIntroducingMD = NULL;

 MethodTable * pParentType = GetParentMethodTable();
 MethodTable * pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while ((pParentType != NULL) &&
 (dwSlot < pParentType->GetNumVirtuals()))
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentMethodTable();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD = pPrevParentType->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}

//==========================================================================================
// There is a case where a method declared in a type can be explicitly
// overridden by a methodImpl on another method within the same type. In
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/methodtable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1671,11 +1671,13 @@ class MethodTable
 // Slots <-> the MethodDesc associated with the slot.
 //

#ifndef DACCESS_COMPILE
 // Get the MethodDesc that implements a given slot
 // NOTE: Since this may fill in the slot with a temporary entrypoint if that hasn't happened
 // yet, when writing asserts, GetMethodDescForSlot_NoThrow should be used to avoid
 // the presence of an assert hiding bugs.
 MethodDesc* GetMethodDescForSlot(DWORD slot);
#endif

 // This api produces the same result as GetMethodDescForSlot, but it uses a variation on the
 // algorithm that does not allocate a temporary entrypoint for the slot if it doesn't exist.
Expand DownExpand Up@@ -2434,8 +2436,6 @@ class MethodTable
 MethodTable *LookupDispatchMapType(DispatchMapTypeID typeID);
 bool DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, MethodTable* pMT);

 MethodDesc *GetIntroducingMethodDesc(DWORD slotNumber);

 // Determines whether all methods in the given interface have their final implementing
 // slot in a parent class. I.e. if this returns TRUE, it is trivial (no VSD lookup) to
 // dispatch pItfMT methods on this class if one knows how to dispatch them on pParentMT.
Expand Down

2 changes: 2 additions & 0 deletions
src/coreclr/vm/methodtable.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,6 +404,7 @@ inline BOOL MethodTable::HasLayout()
}

//==========================================================================================
#ifndef DACCESS_COMPILE
inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)
{
 CONTRACTL
Expand All@@ -425,6 +426,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)

 return MethodTable::GetMethodDescForSlotAddress(pCode);
}
#endif // DACCESS_COMPILE

//==========================================================================================
inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2265,7 +2265,6 @@ class MethodTableBuilder
 inline BOOL IsMethodImpl();
 inline MethodClassification MethodType();
 inline bmtMDMethod *GetMDMethod() const;
 inline MethodDesc *GetIntroducingMethodDesc();
 inline bmtMDMethod * operator->();
 inline bmtMDMethod * operator*() { WRAPPER_NO_CONTRACT; return GetMDMethod(); }
 }; // class DeclaredMethodIterator
Expand Down

32 changes: 0 additions & 32 deletions
src/coreclr/vm/methodtablebuilder.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,6 @@ MethodTableBuilder::DeclaredMethodIterator::GetMDMethod() const
 return m_declaredMethods[m_idx];
}

//*******************************************************************************
inline class MethodDesc *
MethodTableBuilder::DeclaredMethodIterator::GetIntroducingMethodDesc()
{
 STANDARD_VM_CONTRACT;

 bmtMDMethod *pCurrentMD = GetMDMethod();
 DWORD dwSlot = pCurrentMD->GetSlotIndex();
 MethodDesc *pIntroducingMD = NULL;

 bmtRTType *pParentType = pCurrentMD->GetOwningType()->GetParentType();
 bmtRTType *pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while (pParentType != NULL &&
 dwSlot < pParentType->GetMethodTable()->GetNumVirtuals())
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentType();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD =
 pPrevParentType->GetMethodTable()->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}


//***************************************************************************************
inline MethodTableBuilder::bmtMDMethod *
MethodTableBuilder::DeclaredMethodIterator::operator->()
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('^' + ".*" + '

Skip to content
#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api#104989

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

davidwrighton
merged 2 commits into

from

Jul 17, 2024
 Merged


#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api
#104989
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
d6f50f7

#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api


davidwrighton Jul 16, 2024
0427146

Merge branch 'main' into Remove_GetMethodDescForSlot


davidwrighton Jul 16, 2024

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


2 changes: 2 additions & 0 deletions
src/coreclr/vm/classcompat.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,7 @@ class MethodTableBuilder

 DispatchMapBuilder *pDispatchMapBuilder;

#ifndef DACCESS_COMPILE
 MethodDesc* GetMethodDescForSlot(WORD slot)
 {
 CONTRACTL
Expand All@@ -365,6 +366,7 @@ class MethodTableBuilder
 (MethodTable::GetMethodDescForSlotAddress(pVtable[slot]) == pVtableMD[slot]));
 return pVtableMD[slot];
 }
#endif // DACCESS_COMPILE

 void SetMethodDescForSlot(WORD slot, MethodDesc* pMD)
 {
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ LPCUTF8 MethodDesc::GetNameThrowing()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
LPCUTF8 MethodDesc::GetName(USHORT slot)
{
 // MethodDesc::GetDeclMethodDesc can throw.
Expand All@@ -293,6 +294,7 @@ LPCUTF8 MethodDesc::GetName(USHORT slot)
 CONSISTENCY_CHECK(IsInterface() || !pDeclMD->IsInterface());
 return pDeclMD->GetName();
}
#endif // DACCESS_COMPILE

//*******************************************************************************
LPCUTF8 MethodDesc::GetName()
Expand DownExpand Up@@ -590,6 +592,7 @@ PTR_PCODE MethodDesc::GetAddrOfSlot()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
{
 CONTRACTL {
Expand DownExpand Up@@ -642,6 +645,7 @@ PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
 CONSISTENCY_CHECK((UINT32)pMDResult->GetSlot() == slotNumber);
 return PTR_MethodDesc(pMDResult);
}
#endif // DACCESS_COMPILE

//*******************************************************************************
// Returns a hash for the method.
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -333,7 +333,9 @@ class MethodDesc
 // See the TypeString class for better control over name formatting.
 LPCUTF8 GetName();

#ifndef DACCESS_COMPILE
 LPCUTF8 GetName(USHORT slot);
#endif // DACCESS_COMPILE

 LPCUTF8 GetNameThrowing();

Expand DownExpand Up@@ -1053,7 +1055,9 @@ class MethodDesc

 PTR_PCODE GetAddrOfSlot();

#ifndef DACCESS_COMPILE
 PTR_MethodDesc GetDeclMethodDesc(UINT32 slotNumber);
#endif // DACCESS_COMPILE

public:
 mdMethodDef GetMemberDef() const;
Expand Down

35 changes: 0 additions & 35 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5857,41 +5857,6 @@ bool MethodTable::DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, Me
 return intIt.CurrentInterfaceMatches(this, pMT);
}

//==========================================================================================
MethodDesc * MethodTable::GetIntroducingMethodDesc(DWORD slotNumber)
{
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_ANY;
 }
 CONTRACTL_END;

 MethodDesc * pCurrentMD = GetMethodDescForSlot(slotNumber);
 DWORD dwSlot = pCurrentMD->GetSlot();
 MethodDesc * pIntroducingMD = NULL;

 MethodTable * pParentType = GetParentMethodTable();
 MethodTable * pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while ((pParentType != NULL) &&
 (dwSlot < pParentType->GetNumVirtuals()))
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentMethodTable();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD = pPrevParentType->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}

//==========================================================================================
// There is a case where a method declared in a type can be explicitly
// overridden by a methodImpl on another method within the same type. In
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/methodtable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1671,11 +1671,13 @@ class MethodTable
 // Slots <-> the MethodDesc associated with the slot.
 //

#ifndef DACCESS_COMPILE
 // Get the MethodDesc that implements a given slot
 // NOTE: Since this may fill in the slot with a temporary entrypoint if that hasn't happened
 // yet, when writing asserts, GetMethodDescForSlot_NoThrow should be used to avoid
 // the presence of an assert hiding bugs.
 MethodDesc* GetMethodDescForSlot(DWORD slot);
#endif

 // This api produces the same result as GetMethodDescForSlot, but it uses a variation on the
 // algorithm that does not allocate a temporary entrypoint for the slot if it doesn't exist.
Expand DownExpand Up@@ -2434,8 +2436,6 @@ class MethodTable
 MethodTable *LookupDispatchMapType(DispatchMapTypeID typeID);
 bool DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, MethodTable* pMT);

 MethodDesc *GetIntroducingMethodDesc(DWORD slotNumber);

 // Determines whether all methods in the given interface have their final implementing
 // slot in a parent class. I.e. if this returns TRUE, it is trivial (no VSD lookup) to
 // dispatch pItfMT methods on this class if one knows how to dispatch them on pParentMT.
Expand Down

2 changes: 2 additions & 0 deletions
src/coreclr/vm/methodtable.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,6 +404,7 @@ inline BOOL MethodTable::HasLayout()
}

//==========================================================================================
#ifndef DACCESS_COMPILE
inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)
{
 CONTRACTL
Expand All@@ -425,6 +426,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)

 return MethodTable::GetMethodDescForSlotAddress(pCode);
}
#endif // DACCESS_COMPILE

//==========================================================================================
inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2265,7 +2265,6 @@ class MethodTableBuilder
 inline BOOL IsMethodImpl();
 inline MethodClassification MethodType();
 inline bmtMDMethod *GetMDMethod() const;
 inline MethodDesc *GetIntroducingMethodDesc();
 inline bmtMDMethod * operator->();
 inline bmtMDMethod * operator*() { WRAPPER_NO_CONTRACT; return GetMDMethod(); }
 }; // class DeclaredMethodIterator
Expand Down

32 changes: 0 additions & 32 deletions
src/coreclr/vm/methodtablebuilder.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,6 @@ MethodTableBuilder::DeclaredMethodIterator::GetMDMethod() const
 return m_declaredMethods[m_idx];
}

//*******************************************************************************
inline class MethodDesc *
MethodTableBuilder::DeclaredMethodIterator::GetIntroducingMethodDesc()
{
 STANDARD_VM_CONTRACT;

 bmtMDMethod *pCurrentMD = GetMDMethod();
 DWORD dwSlot = pCurrentMD->GetSlotIndex();
 MethodDesc *pIntroducingMD = NULL;

 bmtRTType *pParentType = pCurrentMD->GetOwningType()->GetParentType();
 bmtRTType *pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while (pParentType != NULL &&
 dwSlot < pParentType->GetMethodTable()->GetNumVirtuals())
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentType();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD =
 pPrevParentType->GetMethodTable()->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}


//***************************************************************************************
inline MethodTableBuilder::bmtMDMethod *
MethodTableBuilder::DeclaredMethodIterator::operator->()
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('^' + ".*" + '

Skip to content
#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api#104989

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

davidwrighton
merged 2 commits into

from

Jul 17, 2024
 Merged


#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api
#104989
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
d6f50f7

#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api


davidwrighton Jul 16, 2024
0427146

Merge branch 'main' into Remove_GetMethodDescForSlot


davidwrighton Jul 16, 2024

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


2 changes: 2 additions & 0 deletions
src/coreclr/vm/classcompat.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,7 @@ class MethodTableBuilder

 DispatchMapBuilder *pDispatchMapBuilder;

#ifndef DACCESS_COMPILE
 MethodDesc* GetMethodDescForSlot(WORD slot)
 {
 CONTRACTL
Expand All@@ -365,6 +366,7 @@ class MethodTableBuilder
 (MethodTable::GetMethodDescForSlotAddress(pVtable[slot]) == pVtableMD[slot]));
 return pVtableMD[slot];
 }
#endif // DACCESS_COMPILE

 void SetMethodDescForSlot(WORD slot, MethodDesc* pMD)
 {
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ LPCUTF8 MethodDesc::GetNameThrowing()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
LPCUTF8 MethodDesc::GetName(USHORT slot)
{
 // MethodDesc::GetDeclMethodDesc can throw.
Expand All@@ -293,6 +294,7 @@ LPCUTF8 MethodDesc::GetName(USHORT slot)
 CONSISTENCY_CHECK(IsInterface() || !pDeclMD->IsInterface());
 return pDeclMD->GetName();
}
#endif // DACCESS_COMPILE

//*******************************************************************************
LPCUTF8 MethodDesc::GetName()
Expand DownExpand Up@@ -590,6 +592,7 @@ PTR_PCODE MethodDesc::GetAddrOfSlot()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
{
 CONTRACTL {
Expand DownExpand Up@@ -642,6 +645,7 @@ PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
 CONSISTENCY_CHECK((UINT32)pMDResult->GetSlot() == slotNumber);
 return PTR_MethodDesc(pMDResult);
}
#endif // DACCESS_COMPILE

//*******************************************************************************
// Returns a hash for the method.
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -333,7 +333,9 @@ class MethodDesc
 // See the TypeString class for better control over name formatting.
 LPCUTF8 GetName();

#ifndef DACCESS_COMPILE
 LPCUTF8 GetName(USHORT slot);
#endif // DACCESS_COMPILE

 LPCUTF8 GetNameThrowing();

Expand DownExpand Up@@ -1053,7 +1055,9 @@ class MethodDesc

 PTR_PCODE GetAddrOfSlot();

#ifndef DACCESS_COMPILE
 PTR_MethodDesc GetDeclMethodDesc(UINT32 slotNumber);
#endif // DACCESS_COMPILE

public:
 mdMethodDef GetMemberDef() const;
Expand Down

35 changes: 0 additions & 35 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5857,41 +5857,6 @@ bool MethodTable::DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, Me
 return intIt.CurrentInterfaceMatches(this, pMT);
}

//==========================================================================================
MethodDesc * MethodTable::GetIntroducingMethodDesc(DWORD slotNumber)
{
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_ANY;
 }
 CONTRACTL_END;

 MethodDesc * pCurrentMD = GetMethodDescForSlot(slotNumber);
 DWORD dwSlot = pCurrentMD->GetSlot();
 MethodDesc * pIntroducingMD = NULL;

 MethodTable * pParentType = GetParentMethodTable();
 MethodTable * pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while ((pParentType != NULL) &&
 (dwSlot < pParentType->GetNumVirtuals()))
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentMethodTable();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD = pPrevParentType->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}

//==========================================================================================
// There is a case where a method declared in a type can be explicitly
// overridden by a methodImpl on another method within the same type. In
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/methodtable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1671,11 +1671,13 @@ class MethodTable
 // Slots <-> the MethodDesc associated with the slot.
 //

#ifndef DACCESS_COMPILE
 // Get the MethodDesc that implements a given slot
 // NOTE: Since this may fill in the slot with a temporary entrypoint if that hasn't happened
 // yet, when writing asserts, GetMethodDescForSlot_NoThrow should be used to avoid
 // the presence of an assert hiding bugs.
 MethodDesc* GetMethodDescForSlot(DWORD slot);
#endif

 // This api produces the same result as GetMethodDescForSlot, but it uses a variation on the
 // algorithm that does not allocate a temporary entrypoint for the slot if it doesn't exist.
Expand DownExpand Up@@ -2434,8 +2436,6 @@ class MethodTable
 MethodTable *LookupDispatchMapType(DispatchMapTypeID typeID);
 bool DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, MethodTable* pMT);

 MethodDesc *GetIntroducingMethodDesc(DWORD slotNumber);

 // Determines whether all methods in the given interface have their final implementing
 // slot in a parent class. I.e. if this returns TRUE, it is trivial (no VSD lookup) to
 // dispatch pItfMT methods on this class if one knows how to dispatch them on pParentMT.
Expand Down

2 changes: 2 additions & 0 deletions
src/coreclr/vm/methodtable.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,6 +404,7 @@ inline BOOL MethodTable::HasLayout()
}

//==========================================================================================
#ifndef DACCESS_COMPILE
inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)
{
 CONTRACTL
Expand All@@ -425,6 +426,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)

 return MethodTable::GetMethodDescForSlotAddress(pCode);
}
#endif // DACCESS_COMPILE

//==========================================================================================
inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2265,7 +2265,6 @@ class MethodTableBuilder
 inline BOOL IsMethodImpl();
 inline MethodClassification MethodType();
 inline bmtMDMethod *GetMDMethod() const;
 inline MethodDesc *GetIntroducingMethodDesc();
 inline bmtMDMethod * operator->();
 inline bmtMDMethod * operator*() { WRAPPER_NO_CONTRACT; return GetMDMethod(); }
 }; // class DeclaredMethodIterator
Expand Down

32 changes: 0 additions & 32 deletions
src/coreclr/vm/methodtablebuilder.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,6 @@ MethodTableBuilder::DeclaredMethodIterator::GetMDMethod() const
 return m_declaredMethods[m_idx];
}

//*******************************************************************************
inline class MethodDesc *
MethodTableBuilder::DeclaredMethodIterator::GetIntroducingMethodDesc()
{
 STANDARD_VM_CONTRACT;

 bmtMDMethod *pCurrentMD = GetMDMethod();
 DWORD dwSlot = pCurrentMD->GetSlotIndex();
 MethodDesc *pIntroducingMD = NULL;

 bmtRTType *pParentType = pCurrentMD->GetOwningType()->GetParentType();
 bmtRTType *pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while (pParentType != NULL &&
 dwSlot < pParentType->GetMethodTable()->GetNumVirtuals())
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentType();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD =
 pPrevParentType->GetMethodTable()->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}


//***************************************************************************************
inline MethodTableBuilder::bmtMDMethod *
MethodTableBuilder::DeclaredMethodIterator::operator->()
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); }
})();
})();

Skip to content
#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api#104989

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

davidwrighton
merged 2 commits into

from

Jul 17, 2024
 Merged


#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api
#104989
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
d6f50f7

#ifdef out of the DACCESS_BUILD the GetMethodDescForSlot api


davidwrighton Jul 16, 2024
0427146

Merge branch 'main' into Remove_GetMethodDescForSlot


davidwrighton Jul 16, 2024

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


2 changes: 2 additions & 0 deletions
src/coreclr/vm/classcompat.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,6 +350,7 @@ class MethodTableBuilder

 DispatchMapBuilder *pDispatchMapBuilder;

#ifndef DACCESS_COMPILE
 MethodDesc* GetMethodDescForSlot(WORD slot)
 {
 CONTRACTL
Expand All@@ -365,6 +366,7 @@ class MethodTableBuilder
 (MethodTable::GetMethodDescForSlotAddress(pVtable[slot]) == pVtableMD[slot]));
 return pVtableMD[slot];
 }
#endif // DACCESS_COMPILE

 void SetMethodDescForSlot(WORD slot, MethodDesc* pMD)
 {
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,7 @@ LPCUTF8 MethodDesc::GetNameThrowing()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
LPCUTF8 MethodDesc::GetName(USHORT slot)
{
 // MethodDesc::GetDeclMethodDesc can throw.
Expand All@@ -293,6 +294,7 @@ LPCUTF8 MethodDesc::GetName(USHORT slot)
 CONSISTENCY_CHECK(IsInterface() || !pDeclMD->IsInterface());
 return pDeclMD->GetName();
}
#endif // DACCESS_COMPILE

//*******************************************************************************
LPCUTF8 MethodDesc::GetName()
Expand DownExpand Up@@ -590,6 +592,7 @@ PTR_PCODE MethodDesc::GetAddrOfSlot()
}

//*******************************************************************************
#ifndef DACCESS_COMPILE
PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
{
 CONTRACTL {
Expand DownExpand Up@@ -642,6 +645,7 @@ PTR_MethodDesc MethodDesc::GetDeclMethodDesc(UINT32 slotNumber)
 CONSISTENCY_CHECK((UINT32)pMDResult->GetSlot() == slotNumber);
 return PTR_MethodDesc(pMDResult);
}
#endif // DACCESS_COMPILE

//*******************************************************************************
// Returns a hash for the method.
Expand Down

4 changes: 4 additions & 0 deletions
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -333,7 +333,9 @@ class MethodDesc
 // See the TypeString class for better control over name formatting.
 LPCUTF8 GetName();

#ifndef DACCESS_COMPILE
 LPCUTF8 GetName(USHORT slot);
#endif // DACCESS_COMPILE

 LPCUTF8 GetNameThrowing();

Expand DownExpand Up@@ -1053,7 +1055,9 @@ class MethodDesc

 PTR_PCODE GetAddrOfSlot();

#ifndef DACCESS_COMPILE
 PTR_MethodDesc GetDeclMethodDesc(UINT32 slotNumber);
#endif // DACCESS_COMPILE

public:
 mdMethodDef GetMemberDef() const;
Expand Down

35 changes: 0 additions & 35 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5857,41 +5857,6 @@ bool MethodTable::DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, Me
 return intIt.CurrentInterfaceMatches(this, pMT);
}

//==========================================================================================
MethodDesc * MethodTable::GetIntroducingMethodDesc(DWORD slotNumber)
{
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_ANY;
 }
 CONTRACTL_END;

 MethodDesc * pCurrentMD = GetMethodDescForSlot(slotNumber);
 DWORD dwSlot = pCurrentMD->GetSlot();
 MethodDesc * pIntroducingMD = NULL;

 MethodTable * pParentType = GetParentMethodTable();
 MethodTable * pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while ((pParentType != NULL) &&
 (dwSlot < pParentType->GetNumVirtuals()))
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentMethodTable();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD = pPrevParentType->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}

//==========================================================================================
// There is a case where a method declared in a type can be explicitly
// overridden by a methodImpl on another method within the same type. In
Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/methodtable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1671,11 +1671,13 @@ class MethodTable
 // Slots <-> the MethodDesc associated with the slot.
 //

#ifndef DACCESS_COMPILE
 // Get the MethodDesc that implements a given slot
 // NOTE: Since this may fill in the slot with a temporary entrypoint if that hasn't happened
 // yet, when writing asserts, GetMethodDescForSlot_NoThrow should be used to avoid
 // the presence of an assert hiding bugs.
 MethodDesc* GetMethodDescForSlot(DWORD slot);
#endif

 // This api produces the same result as GetMethodDescForSlot, but it uses a variation on the
 // algorithm that does not allocate a temporary entrypoint for the slot if it doesn't exist.
Expand DownExpand Up@@ -2434,8 +2436,6 @@ class MethodTable
 MethodTable *LookupDispatchMapType(DispatchMapTypeID typeID);
 bool DispatchMapTypeMatchesMethodTable(DispatchMapTypeID typeID, MethodTable* pMT);

 MethodDesc *GetIntroducingMethodDesc(DWORD slotNumber);

 // Determines whether all methods in the given interface have their final implementing
 // slot in a parent class. I.e. if this returns TRUE, it is trivial (no VSD lookup) to
 // dispatch pItfMT methods on this class if one knows how to dispatch them on pParentMT.
Expand Down

2 changes: 2 additions & 0 deletions
src/coreclr/vm/methodtable.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -404,6 +404,7 @@ inline BOOL MethodTable::HasLayout()
}

//==========================================================================================
#ifndef DACCESS_COMPILE
inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)
{
 CONTRACTL
Expand All@@ -425,6 +426,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot)

 return MethodTable::GetMethodDescForSlotAddress(pCode);
}
#endif // DACCESS_COMPILE

//==========================================================================================
inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2265,7 +2265,6 @@ class MethodTableBuilder
 inline BOOL IsMethodImpl();
 inline MethodClassification MethodType();
 inline bmtMDMethod *GetMDMethod() const;
 inline MethodDesc *GetIntroducingMethodDesc();
 inline bmtMDMethod * operator->();
 inline bmtMDMethod * operator*() { WRAPPER_NO_CONTRACT; return GetMDMethod(); }
 }; // class DeclaredMethodIterator
Expand Down

32 changes: 0 additions & 32 deletions
src/coreclr/vm/methodtablebuilder.inl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,38 +136,6 @@ MethodTableBuilder::DeclaredMethodIterator::GetMDMethod() const
 return m_declaredMethods[m_idx];
}

//*******************************************************************************
inline class MethodDesc *
MethodTableBuilder::DeclaredMethodIterator::GetIntroducingMethodDesc()
{
 STANDARD_VM_CONTRACT;

 bmtMDMethod *pCurrentMD = GetMDMethod();
 DWORD dwSlot = pCurrentMD->GetSlotIndex();
 MethodDesc *pIntroducingMD = NULL;

 bmtRTType *pParentType = pCurrentMD->GetOwningType()->GetParentType();
 bmtRTType *pPrevParentType = NULL;

 // Find this method in the parent.
 // If it does exist in the parent, it would be at the same vtable slot.
 while (pParentType != NULL &&
 dwSlot < pParentType->GetMethodTable()->GetNumVirtuals())
 {
 pPrevParentType = pParentType;
 pParentType = pParentType->GetParentType();
 }

 if (pPrevParentType != NULL)
 {
 pIntroducingMD =
 pPrevParentType->GetMethodTable()->GetMethodDescForSlot(dwSlot);
 }

 return pIntroducingMD;
}


//***************************************************************************************
inline MethodTableBuilder::bmtMDMethod *
MethodTableBuilder::DeclaredMethodIterator::operator->()
Expand Down