Skip to content

[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'#92346

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

Closed
dotnet-maestro-bot wants to merge 1 commit into from
Closed

[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' #92346

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/coreclr/debug/daccess/stack.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
{
// It turns out we cannot really get rid of this check. Dynamic methods
// (including IL stubs) do not have their local sig's available after JIT time.
if (!m_methodDesc->IsIL())
// IL methods with dynamically generated IL (for example, UnsafeAccessors) may
// not have an IL header.
COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
? m_methodDesc->GetILHeader()
: NULL;
if (ilHeader == NULL)
{
*sig = NULL;
*count = 0;
return E_FAIL;
}

COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
COR_ILMETHOD_DECODER methodDecoder(ilHeader);
mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
if (localSig == mdSignatureNil)
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/inc/eventtracebase.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -905,7 +905,7 @@ namespace ETW
BOOL fSendRichDebugInfoEvent,
BOOL fGetCodeIds);
static VOID SendEventsForNgenMethods(Module *pModule, DWORD dwEventOptions);
static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
static VOID SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId);
static VOID SendMethodRichDebugInfo(MethodDesc * pMethodDesc, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId, MethodDescSet* sentMethodDetailsSet);
static VOID SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptions, BOOL bIsJit, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, PCODE pNativeCodeStartAddress = 0, PrepareCodeConfig *pConfig = NULL, MethodDescSet* sentMethodDetailsSet = NULL);
Expand DownExpand Up@@ -938,7 +938,7 @@ namespace ETW

static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc);
static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint);
static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
Expand All@@ -952,7 +952,7 @@ namespace ETW
public:
static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc) {};
static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint) {};
static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/utilcode/stresslog.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
#include "ex.h"

#if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
Expand Down
21 changes: 12 additions & 9 deletions src/coreclr/vm/eventtrace.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
CONTRACTL {
NOTHROW;
Expand All@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
CLR_JIT_KEYWORD))
{
pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
}
} EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
Expand DownExpand Up@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::SendMethodJitStartEvent(
MethodDesc *pMethodDesc,
COR_ILMETHOD_DECODER* methodDecoder,
SString *namespaceOrClassName,
SString *methodName,
SString *methodSignature)
{
CONTRACTL {
THROWS;
Expand DownExpand Up@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
ulMethodToken = (ULONG)0;
}
else
ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();

if(pMethodDesc->IsIL())
{
COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
}

if (methodDecoder != NULL)
ulMethodILSize = methodDecoder->GetCodeSize();

SString tNamespace, tMethodName, tMethodSignature;
if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
{
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/jitinterface.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,

SString namespaceOrClassName, methodName, methodSignature;
// Fire an ETW event to mark the beginning of JIT'ing
ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);

CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/method.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ class MethodDesc
PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
PCODE JitCompileCode(PrepareCodeConfig* pConfig);
PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);

public:
bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
Expand Down
116 changes: 58 additions & 58 deletions src/coreclr/vm/prestub.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
}
}

namespace
{
COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
{
STANDARD_VM_CONTRACT;
_ASSERTE(pMD != NULL);
_ASSERTE(!pMD->IsNoMetadata());
_ASSERTE(pConfig != NULL);
_ASSERTE(pDecoderMemory != NULL);

COR_ILMETHOD_DECODER* pHeader = NULL;
COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
if (ilHeader == NULL)
return NULL;

COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
{
// Decoder ctor can AV on a malformed method header
AVInRuntimeImplOkayHolder AVOkay;
pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
}

if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

return pHeader;
}

COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
{
STANDARD_VM_CONTRACT;
_ASSERTE(pMD != NULL);
if (pMD->IsIL())
{
return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
}
else if (pMD->IsILStub())
{
ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
return pResolver->GetILHeader();
}

_ASSERTE(pMD->IsNoMetadata());
return NULL;
}
}

PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
STANDARD_VM_CONTRACT;
Expand DownExpand Up@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
}
#endif // PROFILING_SUPPORTED

// The profiler may have changed the code on the callback. Need to
// pick up the new code.
//
// (don't want this for OSR, need to see how it works)
COR_ILMETHOD_DECODER ilDecoderTemp;
COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
TRACE_LEVEL_VERBOSE,
CLR_JIT_KEYWORD))
{
pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
}
else
{
Expand All@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
// a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
ETW::MethodLog::MethodJitting(this,
pilHeader,
&namespaceOrClassName,
&methodName,
&methodSignature);
#endif

pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);

// Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
Expand DownExpand Up@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
return pCode;
}

namespace
{
COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
{
STANDARD_VM_CONTRACT;
_ASSERTE(pMD != NULL);
_ASSERTE(!pMD->IsNoMetadata());
_ASSERTE(pConfig != NULL);
_ASSERTE(pDecoderMemory != NULL);

COR_ILMETHOD_DECODER* pHeader = NULL;
COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
if (ilHeader == NULL)
return NULL;

COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
{
// Decoder ctor can AV on a malformed method header
AVInRuntimeImplOkayHolder AVOkay;
pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
}

if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

return pHeader;
}

COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
{
STANDARD_VM_CONTRACT;
_ASSERTE(pMD != NULL);
if (pMD->IsIL())
{
return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
}
else if (pMD->IsILStub())
{
ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
return pResolver->GetILHeader();
}

_ASSERTE(pMD->IsNoMetadata());
return NULL;
}
}

PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
STANDARD_VM_CONTRACT;

PCODE pCode = NULL;

// The profiler may have changed the code on the callback. Need to
// pick up the new code.
//
// (don't want this for OSR, need to see how it works)
COR_ILMETHOD_DECODER ilDecoderTemp;
COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

CORJIT_FLAGS jitFlags;
PCODE pOtherCode = NULL;

Expand Down
8 changes: 7 additions & 1 deletion src/coreclr/vm/versionresilienthashcode.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
hash->Add(varValue);
break;
}

case InlineVar: // 2 byte value which is token change resilient
{
uint16_t varValue;
Expand DownExpand Up@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*

initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
}
else if (!pMD->HasILHeader())
{
// Dynamically generated IL methods like UnsafeAccessors may not have
// an IL header.
return false;
}
else
{
COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
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" + '
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' by dotnet-maestro-bot · Pull Request #92346 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'#92346

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

 Closed

dotnet-maestro-bot
wants to merge
1
commit into

from

 Closed


[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'
#92346
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 7 additions & 2 deletions
src/coreclr/debug/daccess/stack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
 {
 // It turns out we cannot really get rid of this check. Dynamic methods
 // (including IL stubs) do not have their local sig's available after JIT time.
 if (!m_methodDesc->IsIL())
 // IL methods with dynamically generated IL (for example, UnsafeAccessors) may
 // not have an IL header.
 COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
 ? m_methodDesc->GetILHeader()
 : NULL;
 if (ilHeader == NULL)
 {
 *sig = NULL;
 *count = 0;
 return E_FAIL;
 }

 COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
 COR_ILMETHOD_DECODER methodDecoder(ilHeader);
 mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
 methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
 if (localSig == mdSignatureNil)
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/inc/eventtracebase.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -905,7 +905,7 @@ namespace ETW
 BOOL fSendRichDebugInfoEvent,
 BOOL fGetCodeIds);
 static VOID SendEventsForNgenMethods(Module *pModule, DWORD dwEventOptions);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId);
 static VOID SendMethodRichDebugInfo(MethodDesc * pMethodDesc, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId, MethodDescSet* sentMethodDetailsSet);
 static VOID SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptions, BOOL bIsJit, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, PCODE pNativeCodeStartAddress = 0, PrepareCodeConfig *pConfig = NULL, MethodDescSet* sentMethodDetailsSet = NULL);
Expand DownExpand Up@@ -938,7 +938,7 @@ namespace ETW

 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc);
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint);
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
 static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
Expand All@@ -952,7 +952,7 @@ namespace ETW
 public:
 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc) {};
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint) {};
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
 static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/utilcode/stresslog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
#include "ex.h"

 #if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
Expand Down

21 changes: 12 additions & 9 deletions
src/coreclr/vm/eventtrace.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
 CONTRACTL {
 NOTHROW;
Expand All@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
 CLR_JIT_KEYWORD))
 {
 pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
 }
 } EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
Expand DownExpand Up@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::SendMethodJitStartEvent(
 MethodDesc *pMethodDesc,
 COR_ILMETHOD_DECODER* methodDecoder,
 SString *namespaceOrClassName,
 SString *methodName,
 SString *methodSignature)
{
 CONTRACTL {
 THROWS;
Expand DownExpand Up@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
 ulMethodToken = (ULONG)0;
 }
 else
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();

 if(pMethodDesc->IsIL())
 {
 COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
 ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
 }

 if (methodDecoder != NULL)
 ulMethodILSize = methodDecoder->GetCodeSize();

 SString tNamespace, tMethodName, tMethodSignature;
 if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/jitinterface.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,

 SString namespaceOrClassName, methodName, methodSignature;
 // Fire an ETW event to mark the beginning of JIT'ing
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);

 CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ class MethodDesc
 PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
 PCODE JitCompileCode(PrepareCodeConfig* pConfig);
 PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);

public:
 bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
Expand Down

116 changes: 58 additions & 58 deletions
src/coreclr/vm/prestub.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
 }
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
 STANDARD_VM_CONTRACT;
Expand DownExpand Up@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 }
#endif // PROFILING_SUPPORTED

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
 TRACE_LEVEL_VERBOSE,
 CLR_JIT_KEYWORD))
 {
 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
 }
 else
 {
Expand All@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 // a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
 ETW::MethodLog::MethodJitting(this,
 pilHeader,
 &namespaceOrClassName,
 &methodName,
 &methodSignature);
#endif

 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);

 // Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
Expand DownExpand Up@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 return pCode;
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
 STANDARD_VM_CONTRACT;

 PCODE pCode = NULL;

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 CORJIT_FLAGS jitFlags;
 PCODE pOtherCode = NULL;

Expand Down

8 changes: 7 additions & 1 deletion
src/coreclr/vm/versionresilienthashcode.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
 hash->Add(varValue);
 break;
 }

 case InlineVar: // 2 byte value which is token change resilient
 {
 uint16_t varValue;
Expand DownExpand Up@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*

 initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
 }
 else if (!pMD->HasILHeader())
 {
 // Dynamically generated IL methods like UnsafeAccessors may not have
 // an IL header.
 return false;
 }
 else
 {
 COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
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('^' + ".*" + '
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' by dotnet-maestro-bot · Pull Request #92346 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'#92346

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

 Closed

dotnet-maestro-bot
wants to merge
1
commit into

from

 Closed


[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'
#92346
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 7 additions & 2 deletions
src/coreclr/debug/daccess/stack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
 {
 // It turns out we cannot really get rid of this check. Dynamic methods
 // (including IL stubs) do not have their local sig's available after JIT time.
 if (!m_methodDesc->IsIL())
 // IL methods with dynamically generated IL (for example, UnsafeAccessors) may
 // not have an IL header.
 COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
 ? m_methodDesc->GetILHeader()
 : NULL;
 if (ilHeader == NULL)
 {
 *sig = NULL;
 *count = 0;
 return E_FAIL;
 }

 COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
 COR_ILMETHOD_DECODER methodDecoder(ilHeader);
 mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
 methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
 if (localSig == mdSignatureNil)
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/inc/eventtracebase.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -905,7 +905,7 @@ namespace ETW
 BOOL fSendRichDebugInfoEvent,
 BOOL fGetCodeIds);
 static VOID SendEventsForNgenMethods(Module *pModule, DWORD dwEventOptions);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId);
 static VOID SendMethodRichDebugInfo(MethodDesc * pMethodDesc, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId, MethodDescSet* sentMethodDetailsSet);
 static VOID SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptions, BOOL bIsJit, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, PCODE pNativeCodeStartAddress = 0, PrepareCodeConfig *pConfig = NULL, MethodDescSet* sentMethodDetailsSet = NULL);
Expand DownExpand Up@@ -938,7 +938,7 @@ namespace ETW

 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc);
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint);
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
 static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
Expand All@@ -952,7 +952,7 @@ namespace ETW
 public:
 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc) {};
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint) {};
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
 static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/utilcode/stresslog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
#include "ex.h"

 #if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
Expand Down

21 changes: 12 additions & 9 deletions
src/coreclr/vm/eventtrace.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
 CONTRACTL {
 NOTHROW;
Expand All@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
 CLR_JIT_KEYWORD))
 {
 pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
 }
 } EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
Expand DownExpand Up@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::SendMethodJitStartEvent(
 MethodDesc *pMethodDesc,
 COR_ILMETHOD_DECODER* methodDecoder,
 SString *namespaceOrClassName,
 SString *methodName,
 SString *methodSignature)
{
 CONTRACTL {
 THROWS;
Expand DownExpand Up@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
 ulMethodToken = (ULONG)0;
 }
 else
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();

 if(pMethodDesc->IsIL())
 {
 COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
 ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
 }

 if (methodDecoder != NULL)
 ulMethodILSize = methodDecoder->GetCodeSize();

 SString tNamespace, tMethodName, tMethodSignature;
 if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/jitinterface.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,

 SString namespaceOrClassName, methodName, methodSignature;
 // Fire an ETW event to mark the beginning of JIT'ing
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);

 CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ class MethodDesc
 PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
 PCODE JitCompileCode(PrepareCodeConfig* pConfig);
 PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);

public:
 bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
Expand Down

116 changes: 58 additions & 58 deletions
src/coreclr/vm/prestub.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
 }
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
 STANDARD_VM_CONTRACT;
Expand DownExpand Up@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 }
#endif // PROFILING_SUPPORTED

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
 TRACE_LEVEL_VERBOSE,
 CLR_JIT_KEYWORD))
 {
 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
 }
 else
 {
Expand All@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 // a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
 ETW::MethodLog::MethodJitting(this,
 pilHeader,
 &namespaceOrClassName,
 &methodName,
 &methodSignature);
#endif

 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);

 // Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
Expand DownExpand Up@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 return pCode;
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
 STANDARD_VM_CONTRACT;

 PCODE pCode = NULL;

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 CORJIT_FLAGS jitFlags;
 PCODE pOtherCode = NULL;

Expand Down

8 changes: 7 additions & 1 deletion
src/coreclr/vm/versionresilienthashcode.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
 hash->Add(varValue);
 break;
 }

 case InlineVar: // 2 byte value which is token change resilient
 {
 uint16_t varValue;
Expand DownExpand Up@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*

 initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
 }
 else if (!pMD->HasILHeader())
 {
 // Dynamically generated IL methods like UnsafeAccessors may not have
 // an IL header.
 return false;
 }
 else
 {
 COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
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('^' + ".*" + '
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' by dotnet-maestro-bot · Pull Request #92346 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'#92346

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

 Closed

dotnet-maestro-bot
wants to merge
1
commit into

from

 Closed


[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'
#92346
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 7 additions & 2 deletions
src/coreclr/debug/daccess/stack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
 {
 // It turns out we cannot really get rid of this check. Dynamic methods
 // (including IL stubs) do not have their local sig's available after JIT time.
 if (!m_methodDesc->IsIL())
 // IL methods with dynamically generated IL (for example, UnsafeAccessors) may
 // not have an IL header.
 COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
 ? m_methodDesc->GetILHeader()
 : NULL;
 if (ilHeader == NULL)
 {
 *sig = NULL;
 *count = 0;
 return E_FAIL;
 }

 COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
 COR_ILMETHOD_DECODER methodDecoder(ilHeader);
 mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
 methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
 if (localSig == mdSignatureNil)
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/inc/eventtracebase.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -905,7 +905,7 @@ namespace ETW
 BOOL fSendRichDebugInfoEvent,
 BOOL fGetCodeIds);
 static VOID SendEventsForNgenMethods(Module *pModule, DWORD dwEventOptions);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId);
 static VOID SendMethodRichDebugInfo(MethodDesc * pMethodDesc, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId, MethodDescSet* sentMethodDetailsSet);
 static VOID SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptions, BOOL bIsJit, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, PCODE pNativeCodeStartAddress = 0, PrepareCodeConfig *pConfig = NULL, MethodDescSet* sentMethodDetailsSet = NULL);
Expand DownExpand Up@@ -938,7 +938,7 @@ namespace ETW

 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc);
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint);
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
 static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
Expand All@@ -952,7 +952,7 @@ namespace ETW
 public:
 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc) {};
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint) {};
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
 static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/utilcode/stresslog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
#include "ex.h"

 #if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
Expand Down

21 changes: 12 additions & 9 deletions
src/coreclr/vm/eventtrace.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
 CONTRACTL {
 NOTHROW;
Expand All@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
 CLR_JIT_KEYWORD))
 {
 pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
 }
 } EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
Expand DownExpand Up@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::SendMethodJitStartEvent(
 MethodDesc *pMethodDesc,
 COR_ILMETHOD_DECODER* methodDecoder,
 SString *namespaceOrClassName,
 SString *methodName,
 SString *methodSignature)
{
 CONTRACTL {
 THROWS;
Expand DownExpand Up@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
 ulMethodToken = (ULONG)0;
 }
 else
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();

 if(pMethodDesc->IsIL())
 {
 COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
 ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
 }

 if (methodDecoder != NULL)
 ulMethodILSize = methodDecoder->GetCodeSize();

 SString tNamespace, tMethodName, tMethodSignature;
 if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/jitinterface.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,

 SString namespaceOrClassName, methodName, methodSignature;
 // Fire an ETW event to mark the beginning of JIT'ing
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);

 CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ class MethodDesc
 PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
 PCODE JitCompileCode(PrepareCodeConfig* pConfig);
 PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);

public:
 bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
Expand Down

116 changes: 58 additions & 58 deletions
src/coreclr/vm/prestub.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
 }
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
 STANDARD_VM_CONTRACT;
Expand DownExpand Up@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 }
#endif // PROFILING_SUPPORTED

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
 TRACE_LEVEL_VERBOSE,
 CLR_JIT_KEYWORD))
 {
 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
 }
 else
 {
Expand All@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 // a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
 ETW::MethodLog::MethodJitting(this,
 pilHeader,
 &namespaceOrClassName,
 &methodName,
 &methodSignature);
#endif

 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);

 // Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
Expand DownExpand Up@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 return pCode;
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
 STANDARD_VM_CONTRACT;

 PCODE pCode = NULL;

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 CORJIT_FLAGS jitFlags;
 PCODE pOtherCode = NULL;

Expand Down

8 changes: 7 additions & 1 deletion
src/coreclr/vm/versionresilienthashcode.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
 hash->Add(varValue);
 break;
 }

 case InlineVar: // 2 byte value which is token change resilient
 {
 uint16_t varValue;
Expand DownExpand Up@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*

 initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
 }
 else if (!pMD->HasILHeader())
 {
 // Dynamically generated IL methods like UnsafeAccessors may not have
 // an IL header.
 return false;
 }
 else
 {
 COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
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" + '
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' by dotnet-maestro-bot · Pull Request #92346 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'#92346

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

 Closed

dotnet-maestro-bot
wants to merge
1
commit into

from

 Closed


[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'
#92346
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 7 additions & 2 deletions
src/coreclr/debug/daccess/stack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
 {
 // It turns out we cannot really get rid of this check. Dynamic methods
 // (including IL stubs) do not have their local sig's available after JIT time.
 if (!m_methodDesc->IsIL())
 // IL methods with dynamically generated IL (for example, UnsafeAccessors) may
 // not have an IL header.
 COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
 ? m_methodDesc->GetILHeader()
 : NULL;
 if (ilHeader == NULL)
 {
 *sig = NULL;
 *count = 0;
 return E_FAIL;
 }

 COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
 COR_ILMETHOD_DECODER methodDecoder(ilHeader);
 mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
 methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
 if (localSig == mdSignatureNil)
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/inc/eventtracebase.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -905,7 +905,7 @@ namespace ETW
 BOOL fSendRichDebugInfoEvent,
 BOOL fGetCodeIds);
 static VOID SendEventsForNgenMethods(Module *pModule, DWORD dwEventOptions);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId);
 static VOID SendMethodRichDebugInfo(MethodDesc * pMethodDesc, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId, MethodDescSet* sentMethodDetailsSet);
 static VOID SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptions, BOOL bIsJit, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, PCODE pNativeCodeStartAddress = 0, PrepareCodeConfig *pConfig = NULL, MethodDescSet* sentMethodDetailsSet = NULL);
Expand DownExpand Up@@ -938,7 +938,7 @@ namespace ETW

 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc);
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint);
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
 static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
Expand All@@ -952,7 +952,7 @@ namespace ETW
 public:
 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc) {};
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint) {};
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
 static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/utilcode/stresslog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
#include "ex.h"

 #if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
Expand Down

21 changes: 12 additions & 9 deletions
src/coreclr/vm/eventtrace.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
 CONTRACTL {
 NOTHROW;
Expand All@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
 CLR_JIT_KEYWORD))
 {
 pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
 }
 } EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
Expand DownExpand Up@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::SendMethodJitStartEvent(
 MethodDesc *pMethodDesc,
 COR_ILMETHOD_DECODER* methodDecoder,
 SString *namespaceOrClassName,
 SString *methodName,
 SString *methodSignature)
{
 CONTRACTL {
 THROWS;
Expand DownExpand Up@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
 ulMethodToken = (ULONG)0;
 }
 else
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();

 if(pMethodDesc->IsIL())
 {
 COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
 ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
 }

 if (methodDecoder != NULL)
 ulMethodILSize = methodDecoder->GetCodeSize();

 SString tNamespace, tMethodName, tMethodSignature;
 if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/jitinterface.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,

 SString namespaceOrClassName, methodName, methodSignature;
 // Fire an ETW event to mark the beginning of JIT'ing
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);

 CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ class MethodDesc
 PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
 PCODE JitCompileCode(PrepareCodeConfig* pConfig);
 PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);

public:
 bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
Expand Down

116 changes: 58 additions & 58 deletions
src/coreclr/vm/prestub.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
 }
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
 STANDARD_VM_CONTRACT;
Expand DownExpand Up@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 }
#endif // PROFILING_SUPPORTED

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
 TRACE_LEVEL_VERBOSE,
 CLR_JIT_KEYWORD))
 {
 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
 }
 else
 {
Expand All@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 // a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
 ETW::MethodLog::MethodJitting(this,
 pilHeader,
 &namespaceOrClassName,
 &methodName,
 &methodSignature);
#endif

 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);

 // Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
Expand DownExpand Up@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 return pCode;
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
 STANDARD_VM_CONTRACT;

 PCODE pCode = NULL;

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 CORJIT_FLAGS jitFlags;
 PCODE pOtherCode = NULL;

Expand Down

8 changes: 7 additions & 1 deletion
src/coreclr/vm/versionresilienthashcode.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
 hash->Add(varValue);
 break;
 }

 case InlineVar: // 2 byte value which is token change resilient
 {
 uint16_t varValue;
Expand DownExpand Up@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*

 initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
 }
 else if (!pMD->HasILHeader())
 {
 // Dynamically generated IL methods like UnsafeAccessors may not have
 // an IL header.
 return false;
 }
 else
 {
 COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
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('^' + ".*" + '
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' by dotnet-maestro-bot · Pull Request #92346 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'#92346

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

 Closed

dotnet-maestro-bot
wants to merge
1
commit into

from

 Closed


[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'
#92346
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 7 additions & 2 deletions
src/coreclr/debug/daccess/stack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
 {
 // It turns out we cannot really get rid of this check. Dynamic methods
 // (including IL stubs) do not have their local sig's available after JIT time.
 if (!m_methodDesc->IsIL())
 // IL methods with dynamically generated IL (for example, UnsafeAccessors) may
 // not have an IL header.
 COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
 ? m_methodDesc->GetILHeader()
 : NULL;
 if (ilHeader == NULL)
 {
 *sig = NULL;
 *count = 0;
 return E_FAIL;
 }

 COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
 COR_ILMETHOD_DECODER methodDecoder(ilHeader);
 mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
 methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
 if (localSig == mdSignatureNil)
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/inc/eventtracebase.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -905,7 +905,7 @@ namespace ETW
 BOOL fSendRichDebugInfoEvent,
 BOOL fGetCodeIds);
 static VOID SendEventsForNgenMethods(Module *pModule, DWORD dwEventOptions);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId);
 static VOID SendMethodRichDebugInfo(MethodDesc * pMethodDesc, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId, MethodDescSet* sentMethodDetailsSet);
 static VOID SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptions, BOOL bIsJit, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, PCODE pNativeCodeStartAddress = 0, PrepareCodeConfig *pConfig = NULL, MethodDescSet* sentMethodDetailsSet = NULL);
Expand DownExpand Up@@ -938,7 +938,7 @@ namespace ETW

 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc);
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint);
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
 static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
Expand All@@ -952,7 +952,7 @@ namespace ETW
 public:
 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc) {};
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint) {};
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
 static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/utilcode/stresslog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
#include "ex.h"

 #if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
Expand Down

21 changes: 12 additions & 9 deletions
src/coreclr/vm/eventtrace.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
 CONTRACTL {
 NOTHROW;
Expand All@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
 CLR_JIT_KEYWORD))
 {
 pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
 }
 } EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
Expand DownExpand Up@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::SendMethodJitStartEvent(
 MethodDesc *pMethodDesc,
 COR_ILMETHOD_DECODER* methodDecoder,
 SString *namespaceOrClassName,
 SString *methodName,
 SString *methodSignature)
{
 CONTRACTL {
 THROWS;
Expand DownExpand Up@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
 ulMethodToken = (ULONG)0;
 }
 else
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();

 if(pMethodDesc->IsIL())
 {
 COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
 ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
 }

 if (methodDecoder != NULL)
 ulMethodILSize = methodDecoder->GetCodeSize();

 SString tNamespace, tMethodName, tMethodSignature;
 if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/jitinterface.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,

 SString namespaceOrClassName, methodName, methodSignature;
 // Fire an ETW event to mark the beginning of JIT'ing
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);

 CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ class MethodDesc
 PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
 PCODE JitCompileCode(PrepareCodeConfig* pConfig);
 PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);

public:
 bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
Expand Down

116 changes: 58 additions & 58 deletions
src/coreclr/vm/prestub.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
 }
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
 STANDARD_VM_CONTRACT;
Expand DownExpand Up@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 }
#endif // PROFILING_SUPPORTED

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
 TRACE_LEVEL_VERBOSE,
 CLR_JIT_KEYWORD))
 {
 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
 }
 else
 {
Expand All@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 // a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
 ETW::MethodLog::MethodJitting(this,
 pilHeader,
 &namespaceOrClassName,
 &methodName,
 &methodSignature);
#endif

 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);

 // Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
Expand DownExpand Up@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 return pCode;
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
 STANDARD_VM_CONTRACT;

 PCODE pCode = NULL;

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 CORJIT_FLAGS jitFlags;
 PCODE pOtherCode = NULL;

Expand Down

8 changes: 7 additions & 1 deletion
src/coreclr/vm/versionresilienthashcode.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
 hash->Add(varValue);
 break;
 }

 case InlineVar: // 2 byte value which is token change resilient
 {
 uint16_t varValue;
Expand DownExpand Up@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*

 initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
 }
 else if (!pMD->HasILHeader())
 {
 // Dynamically generated IL methods like UnsafeAccessors may not have
 // an IL header.
 return false;
 }
 else
 {
 COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
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('^' + ".*" + '
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' by dotnet-maestro-bot · Pull Request #92346 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'#92346

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

 Closed

dotnet-maestro-bot
wants to merge
1
commit into

from

 Closed


[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'
#92346
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 7 additions & 2 deletions
src/coreclr/debug/daccess/stack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
 {
 // It turns out we cannot really get rid of this check. Dynamic methods
 // (including IL stubs) do not have their local sig's available after JIT time.
 if (!m_methodDesc->IsIL())
 // IL methods with dynamically generated IL (for example, UnsafeAccessors) may
 // not have an IL header.
 COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
 ? m_methodDesc->GetILHeader()
 : NULL;
 if (ilHeader == NULL)
 {
 *sig = NULL;
 *count = 0;
 return E_FAIL;
 }

 COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
 COR_ILMETHOD_DECODER methodDecoder(ilHeader);
 mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
 methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
 if (localSig == mdSignatureNil)
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/inc/eventtracebase.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -905,7 +905,7 @@ namespace ETW
 BOOL fSendRichDebugInfoEvent,
 BOOL fGetCodeIds);
 static VOID SendEventsForNgenMethods(Module *pModule, DWORD dwEventOptions);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId);
 static VOID SendMethodRichDebugInfo(MethodDesc * pMethodDesc, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId, MethodDescSet* sentMethodDetailsSet);
 static VOID SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptions, BOOL bIsJit, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, PCODE pNativeCodeStartAddress = 0, PrepareCodeConfig *pConfig = NULL, MethodDescSet* sentMethodDetailsSet = NULL);
Expand DownExpand Up@@ -938,7 +938,7 @@ namespace ETW

 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc);
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint);
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
 static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
Expand All@@ -952,7 +952,7 @@ namespace ETW
 public:
 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc) {};
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint) {};
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
 static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/utilcode/stresslog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
#include "ex.h"

 #if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
Expand Down

21 changes: 12 additions & 9 deletions
src/coreclr/vm/eventtrace.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
 CONTRACTL {
 NOTHROW;
Expand All@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
 CLR_JIT_KEYWORD))
 {
 pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
 }
 } EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
Expand DownExpand Up@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::SendMethodJitStartEvent(
 MethodDesc *pMethodDesc,
 COR_ILMETHOD_DECODER* methodDecoder,
 SString *namespaceOrClassName,
 SString *methodName,
 SString *methodSignature)
{
 CONTRACTL {
 THROWS;
Expand DownExpand Up@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
 ulMethodToken = (ULONG)0;
 }
 else
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();

 if(pMethodDesc->IsIL())
 {
 COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
 ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
 }

 if (methodDecoder != NULL)
 ulMethodILSize = methodDecoder->GetCodeSize();

 SString tNamespace, tMethodName, tMethodSignature;
 if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/jitinterface.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,

 SString namespaceOrClassName, methodName, methodSignature;
 // Fire an ETW event to mark the beginning of JIT'ing
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);

 CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ class MethodDesc
 PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
 PCODE JitCompileCode(PrepareCodeConfig* pConfig);
 PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);

public:
 bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
Expand Down

116 changes: 58 additions & 58 deletions
src/coreclr/vm/prestub.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
 }
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
 STANDARD_VM_CONTRACT;
Expand DownExpand Up@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 }
#endif // PROFILING_SUPPORTED

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
 TRACE_LEVEL_VERBOSE,
 CLR_JIT_KEYWORD))
 {
 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
 }
 else
 {
Expand All@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 // a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
 ETW::MethodLog::MethodJitting(this,
 pilHeader,
 &namespaceOrClassName,
 &methodName,
 &methodSignature);
#endif

 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);

 // Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
Expand DownExpand Up@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 return pCode;
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
 STANDARD_VM_CONTRACT;

 PCODE pCode = NULL;

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 CORJIT_FLAGS jitFlags;
 PCODE pOtherCode = NULL;

Expand Down

8 changes: 7 additions & 1 deletion
src/coreclr/vm/versionresilienthashcode.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
 hash->Add(varValue);
 break;
 }

 case InlineVar: // 2 byte value which is token change resilient
 {
 uint16_t varValue;
Expand DownExpand Up@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*

 initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
 }
 else if (!pMD->HasILHeader())
 {
 // Dynamically generated IL methods like UnsafeAccessors may not have
 // an IL header.
 return false;
 }
 else
 {
 COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
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); }
})();
})();
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' by dotnet-maestro-bot · Pull Request #92346 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'#92346

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

 Closed

dotnet-maestro-bot
wants to merge
1
commit into

from

 Closed


[automated] Merge branch 'release/8.0-rc1' => 'release/8.0'
#92346
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 7 additions & 2 deletions
src/coreclr/debug/daccess/stack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1253,14 +1253,19 @@ ClrDataFrame::GetLocalSig(MetaSig** sig,
 {
 // It turns out we cannot really get rid of this check. Dynamic methods
 // (including IL stubs) do not have their local sig's available after JIT time.
 if (!m_methodDesc->IsIL())
 // IL methods with dynamically generated IL (for example, UnsafeAccessors) may
 // not have an IL header.
 COR_ILMETHOD* ilHeader = m_methodDesc->IsIL()
 ? m_methodDesc->GetILHeader()
 : NULL;
 if (ilHeader == NULL)
 {
 *sig = NULL;
 *count = 0;
 return E_FAIL;
 }

 COR_ILMETHOD_DECODER methodDecoder(m_methodDesc->GetILHeader());
 COR_ILMETHOD_DECODER methodDecoder(ilHeader);
 mdSignature localSig = methodDecoder.GetLocalVarSigTok() ?
 methodDecoder.GetLocalVarSigTok() : mdSignatureNil;
 if (localSig == mdSignatureNil)
Expand Down

6 changes: 3 additions & 3 deletions
src/coreclr/inc/eventtracebase.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -905,7 +905,7 @@ namespace ETW
 BOOL fSendRichDebugInfoEvent,
 BOOL fGetCodeIds);
 static VOID SendEventsForNgenMethods(Module *pModule, DWORD dwEventOptions);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodJitStartEvent(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL);
 static VOID SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId);
 static VOID SendMethodRichDebugInfo(MethodDesc * pMethodDesc, PCODE pNativeCodeStartAddress, DWORD nativeCodeId, ReJITID ilCodeId, MethodDescSet* sentMethodDetailsSet);
 static VOID SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptions, BOOL bIsJit, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, PCODE pNativeCodeStartAddress = 0, PrepareCodeConfig *pConfig = NULL, MethodDescSet* sentMethodDetailsSet = NULL);
Expand DownExpand Up@@ -938,7 +938,7 @@ namespace ETW

 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc);
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint);
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
 static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
Expand All@@ -952,7 +952,7 @@ namespace ETW
 public:
 static VOID GetR2RGetEntryPointStart(MethodDesc *pMethodDesc) {};
 static VOID GetR2RGetEntryPoint(MethodDesc *pMethodDesc, PCODE pEntryPoint) {};
 static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
 static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
 static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
 static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/utilcode/stresslog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,9 @@
#include "switches.h"
#include "stresslog.h"
#include "clrhost.h"
#include "ex.h"
#define DONOT_DEFINE_ETW_CALLBACK
#include "eventtracebase.h"
#include "ex.h"

 #if !defined(STRESS_LOG_READONLY)
#ifdef HOST_WINDOWS
Expand Down

21 changes: 12 additions & 9 deletions
src/coreclr/vm/eventtrace.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3555,7 +3555,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC
/*************************************************/
/* This is called by the runtime when method jitting started */
/*************************************************/
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
{
 CONTRACTL {
 NOTHROW;
Expand All@@ -3570,7 +3570,7 @@ VOID ETW::MethodLog::MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOr
 CLR_JIT_KEYWORD))
 {
 pMethodDesc->GetMethodInfo(*namespaceOrClassName, *methodName, *methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, namespaceOrClassName, methodName, methodSignature);
 ETW::MethodLog::SendMethodJitStartEvent(pMethodDesc, methodDecoder, namespaceOrClassName, methodName, methodSignature);
 }
 } EX_CATCH { } EX_END_CATCH(SwallowAllExceptions);
}
Expand DownExpand Up@@ -4528,7 +4528,12 @@ VOID ETW::MethodLog::SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc,
/*****************************************************************/
/* This routine is used to send an ETW event just before a method starts jitting*/
/*****************************************************************/
VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature)
VOID ETW::MethodLog::SendMethodJitStartEvent(
 MethodDesc *pMethodDesc,
 COR_ILMETHOD_DECODER* methodDecoder,
 SString *namespaceOrClassName,
 SString *methodName,
 SString *methodSignature)
{
 CONTRACTL {
 THROWS;
Expand DownExpand Up@@ -4566,15 +4571,13 @@ VOID ETW::MethodLog::SendMethodJitStartEvent(MethodDesc *pMethodDesc, SString *n
 ulMethodToken = (ULONG)0;
 }
 else
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();

 if(pMethodDesc->IsIL())
 {
 COR_ILMETHOD_DECODER::DecoderStatus decoderstatus = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 COR_ILMETHOD_DECODER ILHeader(pMethodDesc->GetILHeader(), pMethodDesc->GetMDImport(), &decoderstatus);
 ulMethodILSize = (ULONG)ILHeader.GetCodeSize();
 ulMethodToken = (ULONG)pMethodDesc->GetMemberDef();
 }

 if (methodDecoder != NULL)
 ulMethodILSize = methodDecoder->GetCodeSize();

 SString tNamespace, tMethodName, tMethodSignature;
 if(!namespaceOrClassName|| !methodName|| !methodSignature || (methodName->IsEmpty() && namespaceOrClassName->IsEmpty() && methodSignature->IsEmpty()))
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/jitinterface.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12286,7 +12286,7 @@ static CorJitResult CompileMethodWithEtwWrapper(EEJitManager *jitMgr,

 SString namespaceOrClassName, methodName, methodSignature;
 // Fire an ETW event to mark the beginning of JIT'ing
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), &namespaceOrClassName, &methodName, &methodSignature);
 ETW::MethodLog::MethodJitting(reinterpret_cast<MethodDesc*>(info->ftn), NULL, &namespaceOrClassName, &methodName, &methodSignature);

 CorJitResult ret = jitMgr->m_jit->compileMethod(comp, info, flags, nativeEntry, nativeSizeOfCode);

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/method.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1819,7 +1819,7 @@ class MethodDesc
 PCODE GetMulticoreJitCode(PrepareCodeConfig* pConfig, bool* pWasTier0);
 PCODE JitCompileCode(PrepareCodeConfig* pConfig);
 PCODE JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);
 PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode);

public:
 bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
Expand Down

116 changes: 58 additions & 58 deletions
src/coreclr/vm/prestub.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -709,6 +709,53 @@ PCODE MethodDesc::JitCompileCode(PrepareCodeConfig* pConfig)
 }
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry)
{
 STANDARD_VM_CONTRACT;
Expand DownExpand Up@@ -759,11 +806,18 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 }
#endif // PROFILING_SUPPORTED

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 if (!ETW_TRACING_CATEGORY_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context,
 TRACE_LEVEL_VERBOSE,
 CLR_JIT_KEYWORD))
 {
 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);
 }
 else
 {
Expand All@@ -778,12 +832,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 // a small stub of native code but no native-IL mapping.
#ifndef FEATURE_INTERPRETER
 ETW::MethodLog::MethodJitting(this,
 pilHeader,
 &namespaceOrClassName,
 &methodName,
 &methodSignature);
#endif

 pCode = JitCompileCodeLocked(pConfig, pEntry, &sizeOfCode);
 pCode = JitCompileCodeLocked(pConfig, pilHeader, pEntry, &sizeOfCode);

 // Interpretted methods skip this notification
#ifdef FEATURE_INTERPRETER
Expand DownExpand Up@@ -869,66 +924,11 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J
 return pCode;
}

namespace
{
 COR_ILMETHOD_DECODER* GetAndVerifyMetadataILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 _ASSERTE(!pMD->IsNoMetadata());
 _ASSERTE(pConfig != NULL);
 _ASSERTE(pDecoderMemory != NULL);

 COR_ILMETHOD_DECODER* pHeader = NULL;
 COR_ILMETHOD* ilHeader = pConfig->GetILHeader();
 if (ilHeader == NULL)
 return NULL;

 COR_ILMETHOD_DECODER::DecoderStatus status = COR_ILMETHOD_DECODER::FORMAT_ERROR;
 {
 // Decoder ctor can AV on a malformed method header
 AVInRuntimeImplOkayHolder AVOkay;
 pHeader = new (pDecoderMemory) COR_ILMETHOD_DECODER(ilHeader, pMD->GetMDImport(), &status);
 }

 if (status == COR_ILMETHOD_DECODER::FORMAT_ERROR)
 COMPlusThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_IL);

 return pHeader;
 }

 COR_ILMETHOD_DECODER* GetAndVerifyILHeader(MethodDesc* pMD, PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pIlDecoderMemory)
 {
 STANDARD_VM_CONTRACT;
 _ASSERTE(pMD != NULL);
 if (pMD->IsIL())
 {
 return GetAndVerifyMetadataILHeader(pMD, pConfig, pIlDecoderMemory);
 }
 else if (pMD->IsILStub())
 {
 ILStubResolver* pResolver = pMD->AsDynamicMethodDesc()->GetILStubResolver();
 return pResolver->GetILHeader();
 }

 _ASSERTE(pMD->IsNoMetadata());
 return NULL;
 }
}

PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
PCODE MethodDesc::JitCompileCodeLocked(PrepareCodeConfig* pConfig, COR_ILMETHOD_DECODER* pilHeader, JitListLockEntry* pEntry, ULONG* pSizeOfCode)
{
 STANDARD_VM_CONTRACT;

 PCODE pCode = NULL;

 // The profiler may have changed the code on the callback. Need to
 // pick up the new code.
 //
 // (don't want this for OSR, need to see how it works)
 COR_ILMETHOD_DECODER ilDecoderTemp;
 COR_ILMETHOD_DECODER* pilHeader = GetAndVerifyILHeader(this, pConfig, &ilDecoderTemp);

 CORJIT_FLAGS jitFlags;
 PCODE pOtherCode = NULL;

Expand Down

8 changes: 7 additions & 1 deletion
src/coreclr/vm/versionresilienthashcode.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ bool AddVersionResilientHashCodeForInstruction(ILInstructionParser *parser, xxHa
 hash->Add(varValue);
 break;
 }

 case InlineVar: // 2 byte value which is token change resilient
 {
 uint16_t varValue;
Expand DownExpand Up@@ -388,6 +388,12 @@ bool GetVersionResilientILCodeHashCode(MethodDesc *pMD, int* hashCode, unsigned*

 initLocals = (options & CORINFO_OPT_INIT_LOCALS) == CORINFO_OPT_INIT_LOCALS;
 }
 else if (!pMD->HasILHeader())
 {
 // Dynamically generated IL methods like UnsafeAccessors may not have
 // an IL header.
 return false;
 }
 else
 {
 COR_ILMETHOD_DECODER header(pMD->GetILHeader(TRUE), pMD->GetMDImport(), NULL);
Expand Down