Skip to content
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.

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

[CoreCLR/NativeAOT] UnsafeAccessorAttribute non-generic support #86932

Merged
merged 55 commits into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
0e18368
General cleanup
AaronRobinsonMSFT May 26, 2023
292da73
Prototype for UnsafeAccessorAttribute
AaronRobinsonMSFT May 26, 2023
40111fa
Remove IsUnsafeAccessor flag from MethodDesc
AaronRobinsonMSFT May 27, 2023
0191e0d
Cleanup memory managment confusion
AaronRobinsonMSFT May 27, 2023
ef239fb
Fix non-standard C++
AaronRobinsonMSFT May 29, 2023
a396e04
Add UnsafeAccessorAttribute API
AaronRobinsonMSFT May 29, 2023
6437420
C++ clean-up
AaronRobinsonMSFT May 29, 2023
b24717a
Return missing(field/method) HRESULT when
AaronRobinsonMSFT May 29, 2023
edd7fb7
Implement IL generation for all accessor paths
AaronRobinsonMSFT May 30, 2023
03a9ef3
Implement static/instance field lookup
AaronRobinsonMSFT May 30, 2023
d771f04
Implement static/instance method lookup
AaronRobinsonMSFT May 30, 2023
02267ff
Alter member names for clarity.
AaronRobinsonMSFT May 30, 2023
e911d3a
Add libraries tests
AaronRobinsonMSFT May 31, 2023
c6dbb50
Remove CORINFO_MODULE_ALLACCESS scope
AaronRobinsonMSFT May 31, 2023
9864b45
Fix message buffer
AaronRobinsonMSFT May 31, 2023
60c38dd
Throw exceptions instead of returning HRESULT.
AaronRobinsonMSFT May 31, 2023
10b9c75
Update visibility check API
AaronRobinsonMSFT May 31, 2023
3e9ee12
Remove enum METHOD_TYPE.
AaronRobinsonMSFT May 31, 2023
62f9e81
Disable tests on Mono
AaronRobinsonMSFT May 31, 2023
a506601
Missing virtual destructor
AaronRobinsonMSFT May 31, 2023
b8c94bf
Apply suggestions from code review
AaronRobinsonMSFT Jun 1, 2023
636e616
Apply suggestions from code review
AaronRobinsonMSFT Jun 1, 2023
72bc7f5
Add error message for invalid UnsafeAccessor use
AaronRobinsonMSFT Jun 5, 2023
2859b6e
Debugger logging updates
AaronRobinsonMSFT Jun 5, 2023
331f4cc
Update BOTR on TypeDesc
AaronRobinsonMSFT Jun 5, 2023
c01080e
Fix type used in message
AaronRobinsonMSFT Jun 5, 2023
1d5c1ab
Support UnsafeAccessor in NativeAOT
AaronRobinsonMSFT Jun 5, 2023
34ada73
Review feedback
AaronRobinsonMSFT Jun 6, 2023
a56bc40
Additional test for ctor
AaronRobinsonMSFT Jun 6, 2023
a43b3cc
Remove ctor special case lookup
AaronRobinsonMSFT Jun 6, 2023
3da55de
Remove usage of MetaSig
AaronRobinsonMSFT Jun 6, 2023
bbe820c
Collect custom modifiers counts
AaronRobinsonMSFT Jun 7, 2023
18a2749
Convert all tests to be runtime tests.
AaronRobinsonMSFT Jun 8, 2023
d5ff647
Defined ambiguity logic with respect to
AaronRobinsonMSFT Jun 8, 2023
924cf37
Address ambiguity in NativeAOT
AaronRobinsonMSFT Jun 8, 2023
305aeff
Add all previous tests in libraries into runtime
AaronRobinsonMSFT Jun 8, 2023
c169969
Use AmbiguousMatchException
AaronRobinsonMSFT Jun 8, 2023
3b3691f
Move tests to be Pri0 since they are all we have.
AaronRobinsonMSFT Jun 8, 2023
f0756b7
Add support in ILAsm
AaronRobinsonMSFT Jun 9, 2023
c51e986
Use xplat ARRAY_SIZE.
AaronRobinsonMSFT Jun 9, 2023
12ba472
Remove special handling of empty method in ILASM
AaronRobinsonMSFT Jun 9, 2023
efb27a4
Generate accessors that throw specific failures.
AaronRobinsonMSFT Jun 9, 2023
d3b0726
NativeAOT error handling was throwing asserts.
AaronRobinsonMSFT Jun 9, 2023
56d733e
Remove catch all for any exception. This code
AaronRobinsonMSFT Jun 10, 2023
facc48e
Use declaration method as owner for stubs
AaronRobinsonMSFT Jun 10, 2023
8d92e7e
Review feedback
AaronRobinsonMSFT Jun 10, 2023
b446a20
Improve MissingMethodException
AaronRobinsonMSFT Jun 12, 2023
5b67d04
Missed fallback name lookup on NativeAOT.
AaronRobinsonMSFT Jun 12, 2023
3663bad
Tests for calling convention bits on NativeAOT.
AaronRobinsonMSFT Jun 12, 2023
c2be6fc
Remove block of doc text for generics. Will add
AaronRobinsonMSFT Jun 12, 2023
63f975c
Treat signature calling convention bits like we treat
AaronRobinsonMSFT Jun 13, 2023
869a5f0
Managed and unmanaged function pointers never
AaronRobinsonMSFT Jun 13, 2023
c03dc9e
Feedback for throwing exceptions on NativeAOT
AaronRobinsonMSFT Jun 13, 2023
a309b06
Merge remote-tracking branch 'upstream/main' into runtime_86161
AaronRobinsonMSFT Jun 14, 2023
b957416
Missing NAOT version of error string
AaronRobinsonMSFT Jun 14, 2023
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
6 changes: 1 addition & 5 deletions docs/design/coreclr/botr/type-loader.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ If `MyClass` fails to load, for example because it's supposed to be defined in a

## Key Data Structures

The most universal type designation in the CLR is the `TypeHandle`. It's an abstract entity which encapsulates a pointer to either a `MethodTable` (representing "ordinary" types like `System.Object` or `List<string>`) or a `TypeDesc` (representing byrefs, pointers, function pointers, arrays, and generic variables). It constitutes the identity of a type in that two handles are equal if and only if they represent the same type. To save space, the fact that a `TypeHandle` contains a `TypeDesc` is indicated by setting the second lowest bit of the pointer to 1 (i.e. (ptr | 2)) instead of using additional flags<sup>2</sup>. `TypeDesc` is "abstract" and has the following inheritance hierarchy.
The most universal type designation in the CLR is the `TypeHandle`. It's an abstract entity which encapsulates a pointer to either a `MethodTable` (representing "ordinary" types like `System.Object` or `List<string>`) or a `TypeDesc` (representing byrefs, pointers, function pointers and generic variables). It constitutes the identity of a type in that two handles are equal if and only if they represent the same type. To save space, the fact that a `TypeHandle` contains a `TypeDesc` is indicated by setting the second lowest bit of the pointer to 1 (i.e. (ptr | 2)) instead of using additional flags<sup>2</sup>. `TypeDesc` is "abstract" and has the following inheritance hierarchy.

![Figure 2](images/typeloader-fig2.png)

Expand All @@ -122,10 +122,6 @@ Represents a function pointer, essentially a variable-length list of type handle

This descriptor represents a byref and pointer types. Byrefs are the results of the `ref` and `out` C# keywords applied to method parameters<sup>3</sup> whereas pointer types are unmanaged pointers to data used in unsafe C# and managed C++.

**`ArrayTypeDesc`**

Represents array types. It is derived from `ParamTypeDesc` because arrays are also parameterized by a single parameter (the type of their element). This is opposed to generic instantiations whose number of parameters is variable.

**`MethodTable`**

This is by far the central data structure of the runtime. It represents any type which does not fall into one of the categories above (this includes primitive types, and generic types, both "open" and "closed"). It contains everything about the type that needs to be looked up quickly, such as its parent type, implemented interfaces, and the v-table.
Expand Down
134 changes: 64 additions & 70 deletions src/coreclr/debug/ee/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2373,7 +2373,7 @@ bool DebuggerController::PatchTrace(TraceDestination *trace,
// trace->address is actually a MethodDesc* of the method that we'll
// soon JIT, so put a relative bp at offset zero in.
LOG((LF_CORDB, LL_INFO10000,
"Setting unjitted method patch in MethodDesc 0x%p %s\n", trace->GetMethodDesc(), trace->GetMethodDesc() ? trace->GetMethodDesc()->m_pszDebugMethodName : ""));
"Setting unjitted method patch in MethodDesc %p %s\n", trace->GetMethodDesc(), trace->GetMethodDesc() ? trace->GetMethodDesc()->m_pszDebugMethodName : ""));

// Note: we have to make sure to bind here. If this function is prejitted, this may be our only chance to get a
// DebuggerJITInfo and thereby cause a JITComplete callback.
Expand Down Expand Up @@ -2484,7 +2484,7 @@ bool DebuggerController::MatchPatch(Thread *thread,
}
}

LOG((LF_CORDB, LL_INFO100000, "DC::MP: Returning true"));
LOG((LF_CORDB, LL_INFO100000, "DC::MP: Returning true\n"));

return true;
}
Expand Down Expand Up @@ -3317,11 +3317,11 @@ BOOL DebuggerController::DispatchExceptionHook(Thread *thread,
}
CONTRACTL_END;

LOG((LF_CORDB, LL_INFO1000, "DC:: DispatchExceptionHook\n"));
LOG((LF_CORDB, LL_INFO1000, "DC::DEH: DispatchExceptionHook\n"));

if (!g_patchTableValid)
{
LOG((LF_CORDB, LL_INFO1000, "DC::DEH returning, no patch table.\n"));
LOG((LF_CORDB, LL_INFO1000, "DC::DEH: returning, no patch table.\n"));
return (TRUE);
}

Expand All @@ -3339,24 +3339,24 @@ BOOL DebuggerController::DispatchExceptionHook(Thread *thread,
DebuggerController *pNext = p->m_next;

if (p->m_exceptionHook
&& (p->m_thread == NULL || p->m_thread == thread) &&
tpr != TPR_IGNORE_AND_STOP)
&& (p->m_thread == NULL || p->m_thread == thread)
&& tpr != TPR_IGNORE_AND_STOP)
{
LOG((LF_CORDB, LL_INFO1000, "DC::DEH calling TEH...\n"));
LOG((LF_CORDB, LL_INFO1000, "DC::DEH: calling TEH...\n"));
tpr = p->TriggerExceptionHook(thread, context , pException);
LOG((LF_CORDB, LL_INFO1000, "DC::DEH ... returned.\n"));
LOG((LF_CORDB, LL_INFO1000, "DC::DEH: ... returned.\n"));

if (tpr == TPR_IGNORE_AND_STOP)
{
LOG((LF_CORDB, LL_INFO1000, "DC:: DEH: leaving early!\n"));
LOG((LF_CORDB, LL_INFO1000, "DC::DEH: leaving early!\n"));
break;
}
}

p = pNext;
}

LOG((LF_CORDB, LL_INFO1000, "DC:: DEH: returning 0x%x!\n", tpr));
LOG((LF_CORDB, LL_INFO1000, "DC::DEH: returning 0x%x!\n", tpr));

return (tpr != TPR_IGNORE_AND_STOP);
}
Expand Down Expand Up @@ -4725,11 +4725,11 @@ TP_RESULT DebuggerPatchSkip::TriggerExceptionHook(Thread *thread, CONTEXT * cont
SIZE_T *sp = (SIZE_T *) GetSP(context);

LOG((LF_CORDB, LL_INFO10000,
"Bypass call return address redirected from 0x%p\n", *sp));
"Bypass call return address redirected from %p\n", *sp));

*sp -= patchBypass - (BYTE*)m_address;

LOG((LF_CORDB, LL_INFO10000, "to 0x%p\n", *sp));
LOG((LF_CORDB, LL_INFO10000, "to %p\n", *sp));
#else
PORTABILITY_ASSERT("DebuggerPatchSkip::TriggerExceptionHook -- return address fixup NYI");
#endif
Expand All @@ -4739,7 +4739,7 @@ TP_RESULT DebuggerPatchSkip::TriggerExceptionHook(Thread *thread, CONTEXT * cont
{
// Fixup IP

LOG((LF_CORDB, LL_INFO10000, "Bypass instruction redirected from 0x%p\n", GetIP(context)));
LOG((LF_CORDB, LL_INFO10000, "Bypass instruction redirected from %p\n", GetIP(context)));

if (IsSingleStep(exception->ExceptionCode))
{
Expand Down Expand Up @@ -4786,9 +4786,9 @@ TP_RESULT DebuggerPatchSkip::TriggerExceptionHook(Thread *thread, CONTEXT * cont
((size_t)GetIP(context) > (size_t)patchBypass &&
(size_t)GetIP(context) <= (size_t)(patchBypass + MAX_INSTRUCTION_LENGTH + 1)))
{
LOG((LF_CORDB, LL_INFO10000, "Bypass instruction redirected because still in skip area.\n"));
LOG((LF_CORDB, LL_INFO10000, "m_fIsCall = %d, patchBypass = 0x%x, m_address = 0x%x\n",
m_instrAttrib.m_fIsCall, patchBypass, m_address));
LOG((LF_CORDB, LL_INFO10000, "Bypass instruction redirected because still in skip area.\n"
"\tm_fIsCall = %s, patchBypass = %p, m_address = %p\n",
(m_instrAttrib.m_fIsCall ? "true" : "false"), patchBypass, m_address));
SetIP(context, (PCODE)((BYTE *)GetIP(context) - (patchBypass - (BYTE *)m_address)));
}
else
Expand Down Expand Up @@ -4822,8 +4822,7 @@ TP_RESULT DebuggerPatchSkip::TriggerExceptionHook(Thread *thread, CONTEXT * cont
SetIP(context, (PCODE)((BYTE *)GetIP(context) - (patchBypass - (BYTE *)m_address)));
}

LOG((LF_CORDB, LL_ALWAYS, "to 0x%x\n", GetIP(context)));

LOG((LF_CORDB, LL_ALWAYS, "DPS::TEH: IP now at %p\n", GetIP(context)));
}

#endif
Expand Down Expand Up @@ -5376,39 +5375,36 @@ bool DebuggerStepper::DetectHandleInterceptors(ControllerStackInfo *info)

BOOL DebuggerStepper::DetectHandleLCGMethods(const PCODE ip, MethodDesc * pMD, ControllerStackInfo * pInfo)
{
// If a MethodDesc is specified, it has to match the given IP.
_ASSERTE(pMD == NULL || pMD == g_pEEInterface->GetNativeCodeMethodDesc(ip));

// Look up the MethodDesc for the given IP.
if (pMD == NULL)
{
if (g_pEEInterface->IsManagedNativeCode((const BYTE *)ip))
{
pMD = g_pEEInterface->GetNativeCodeMethodDesc(ip);
_ASSERTE(pMD != NULL);
}
}
#if defined(_DEBUG)
else
{
// If a MethodDesc is specified, it has to match the given IP.
_ASSERTE(pMD == g_pEEInterface->GetNativeCodeMethodDesc(ip));
// If the given IP is in unmanaged code, then it isn't an LCG method
if (!g_pEEInterface->IsManagedNativeCode((const BYTE *)ip))
return FALSE;

pMD = g_pEEInterface->GetNativeCodeMethodDesc(ip);
}
#endif // _DEBUG

// If the given IP is in unmanaged code, then we won't have a MethodDesc by this point.
if (pMD != NULL)
{
if (pMD->IsLCGMethod())
{
// Enable all the traps to catch the thread.
EnableUnwind(m_fp);
EnableJMCBackStop(pMD);
_ASSERTE(pMD != NULL);
LOG((LF_CORDB, LL_INFO10000, "DS::DHLCGM: ip:%zx pMD:%p (%s::%s)\n",
ip,
pMD,
pMD->m_pszDebugClassName,
pMD->m_pszDebugMethodName));

pInfo->SetReturnFrameWithActiveFrame();
TrapStepOut(pInfo);
return TRUE;
}
}
if (!pMD->IsLCGMethod())
return FALSE;

return FALSE;
// Enable all the traps to catch the thread.
EnableUnwind(m_fp);
EnableJMCBackStop(pMD);

pInfo->SetReturnFrameWithActiveFrame();
TrapStepOut(pInfo);
return TRUE;
}


Expand Down Expand Up @@ -5523,19 +5519,19 @@ bool DebuggerStepper::TrapStepInto(ControllerStackInfo *info,
if (IsCloserToRoot(info->m_activeFrame.fp, m_fpStepInto))
m_fpStepInto = info->m_activeFrame.fp;

LOG((LF_CORDB, LL_INFO1000, "DS::TSI this:0x%p m_fpStepInto:0x%p\n",
this, m_fpStepInto.GetSPValue()));
LOG((LF_CORDB, LL_INFO1000, "DS::TSI this:%p m_fpStepInto:%p ip:%p\n",
this, m_fpStepInto.GetSPValue(), ip));

TraceDestination trace;

// Trace through the stubs.
// If we're calling from managed code, this should either succeed
// or become an ecall into mscorwks.
// @Todo - what about stubs in mscorwks.
// or become an ecall into coreclr.
// @todo - if this fails, we want to provide as much info as possible.
if (!g_pEEInterface->TraceStub(ip, &trace)
|| !g_pEEInterface->FollowTrace(&trace))
{
LOG((LF_CORDB, LL_INFO1000, "DS::TSI Failed to step into\n"));
return false;
}

Expand Down Expand Up @@ -5964,8 +5960,8 @@ bool DebuggerStepper::TrapStep(ControllerStackInfo *info, bool in)

case WALK_UNKNOWN:
LWALK_UNKNOWN:
LOG((LF_CORDB,LL_INFO10000,"DS::TS:WALK_UNKNOWN - curIP:0x%p "
"nextIP:0x%p skipIP:0x%p 1st byte of opcode:0x%x\n", (BYTE*)GetControlPC(&(info->m_activeFrame.
LOG((LF_CORDB,LL_INFO10000,"DS::TS:WALK_UNKNOWN - curIP:%p "
"nextIP:%p skipIP:%p 1st byte of opcode:0x%x\n", (BYTE*)GetControlPC(&(info->m_activeFrame.
registers)), walker.GetNextIP(),walker.GetSkipIP(),
*(BYTE*)GetControlPC(&(info->m_activeFrame.registers))));

Expand Down Expand Up @@ -6713,7 +6709,7 @@ bool DebuggerStepper::SetRangesFromIL(DebuggerJitInfo *dji, COR_DEBUG_STEP_RANGE
{
// {0...-1} means use the entire method as the range
// Code dup'd from below case.
LOG((LF_CORDB, LL_INFO10000, "DS:Step: Have DJI, special (0,-1) entry\n"));
LOG((LF_CORDB, LL_INFO10000, "DS::Step: Have DJI, special (0,-1) entry\n"));
rTo->startOffset = 0;
rTo->endOffset = (ULONG32)g_pEEInterface->GetFunctionSize(fd);
}
Expand Down Expand Up @@ -6777,7 +6773,7 @@ bool DebuggerStepper::SetRangesFromIL(DebuggerJitInfo *dji, COR_DEBUG_STEP_RANGE
}
}

LOG((LF_CORDB, LL_INFO10000, "DS:Step: nat off:0x%x to 0x%x\n", rTo->startOffset, rTo->endOffset));
LOG((LF_CORDB, LL_INFO10000, "DS::Step: nat off:0x%x to 0x%x\n", rTo->startOffset, rTo->endOffset));
}
}
}
Expand All @@ -6799,15 +6795,15 @@ bool DebuggerStepper::SetRangesFromIL(DebuggerJitInfo *dji, COR_DEBUG_STEP_RANGE
{
if (r->startOffset == 0 && r->endOffset == (ULONG) ~0)
{
LOG((LF_CORDB, LL_INFO10000, "DS:Step:No DJI, (0,-1) special entry\n"));
LOG((LF_CORDB, LL_INFO10000, "DS::Step:No DJI, (0,-1) special entry\n"));
// Code dup'd from above case.
// {0...-1} means use the entire method as the range
rTo->startOffset = 0;
rTo->endOffset = (ULONG32)functionSize;
}
else
{
LOG((LF_CORDB, LL_INFO10000, "DS:Step:No DJI, regular entry\n"));
LOG((LF_CORDB, LL_INFO10000, "DS::Step:No DJI, regular entry\n"));
// We can't just leave ths IL entry - we have to
// get rid of it.
// This will just be ignored
Expand Down Expand Up @@ -6949,12 +6945,12 @@ bool DebuggerStepper::Step(FramePointer fp, bool in,
}
m_eMode = m_stepIn ? cStepIn : cStepOver;

LOG((LF_CORDB,LL_INFO10000,"DS 0x%p Step: STEP_NORMAL\n",this));
LOG((LF_CORDB,LL_INFO10000,"DS::Step %p STEP_NORMAL\n",this));
m_reason = STEP_NORMAL; //assume it'll be a normal step & set it to
//something else if we walk over it
if (fIsILStub)
{
LOG((LF_CORDB, LL_INFO10000, "DS:Step: stepping in an IL stub\n"));
LOG((LF_CORDB, LL_INFO10000, "DS::Step: stepping in an IL stub\n"));

// Enable the right triggers if the user wants to step in.
if (in)
Expand All @@ -6978,12 +6974,12 @@ bool DebuggerStepper::Step(FramePointer fp, bool in,
}
else if (!TrapStep(&info, in))
{
LOG((LF_CORDB,LL_INFO10000,"DS:Step: Did TS\n"));
LOG((LF_CORDB,LL_INFO10000,"DS::Step: Did TS\n"));
m_stepIn = true;
TrapStepNext(&info);
}

LOG((LF_CORDB,LL_INFO10000,"DS:Step: Did TS,TSO\n"));
LOG((LF_CORDB,LL_INFO10000,"DS::Step: Did TS,TSO\n"));

EnableUnwind(m_fp);

Expand Down Expand Up @@ -7316,13 +7312,13 @@ void DebuggerStepper::TriggerMethodEnter(Thread * thread,
_ASSERTE(!IsFrozen());

MethodDesc * pDesc = dji->m_nativeCodeVersion.GetMethodDesc();
LOG((LF_CORDB, LL_INFO10000, "DebuggerStepper::TME, desc=%p, addr=%p\n",
LOG((LF_CORDB, LL_INFO10000, "DS::TME, desc=%p, addr=%p\n",
pDesc, ip));

// JMC steppers won't stop in Lightweight codegen (LCG). Just return & keep executing.
if (pDesc->IsNoMetadata())
{
LOG((LF_CORDB, LL_INFO100000, "DebuggerStepper::TME, skipping b/c it's dynamic code (LCG)\n"));
LOG((LF_CORDB, LL_INFO100000, "DS::TME, skipping b/c it's dynamic code (LCG)\n"));
return;
}

Expand Down Expand Up @@ -7382,9 +7378,7 @@ void DebuggerStepper::TriggerMethodEnter(Thread * thread,
}
#endif



// Place a patch to stopus.
// Place a patch to stop us.
// Don't bind to a particular AppDomain so that we can do a Cross-Appdomain step.
AddBindAndActivateNativeManagedPatch(pDesc,
dji,
Expand All @@ -7393,9 +7387,9 @@ void DebuggerStepper::TriggerMethodEnter(Thread * thread,
NULL // AppDomain
);

LOG((LF_CORDB, LL_INFO10000, "DJMCStepper::TME, after setting patch to stop\n"));
LOG((LF_CORDB, LL_INFO10000, "DS::TME, after setting patch to stop\n"));

// Once we resume, we'll go hit that patch (duh, we patched our return address)
// Once we resume, we'll go hit that patch since we patched our return address.
// Furthermore, we know the step will complete with reason = call, so set that now.
m_reason = STEP_CALL;
}
Expand All @@ -7406,7 +7400,7 @@ void DebuggerStepper::TriggerMethodEnter(Thread * thread,
// We never single-step into calls (we place a patch at the call destination).
bool DebuggerStepper::TriggerSingleStep(Thread *thread, const BYTE *ip)
{
LOG((LF_CORDB,LL_INFO10000,"DS:TSS this:0x%p, @ ip:0x%p\n", this, ip));
LOG((LF_CORDB,LL_INFO10000,"DS::TSS this:0x%p, @ ip:0x%p\n", this, ip));

_ASSERTE(!IsFrozen());

Expand Down Expand Up @@ -7507,12 +7501,12 @@ bool DebuggerStepper::TriggerSingleStep(Thread *thread, const BYTE *ip)

void DebuggerStepper::TriggerTraceCall(Thread *thread, const BYTE *ip)
{
LOG((LF_CORDB,LL_INFO10000,"DS:TTC this:0x%x, @ ip:0x%x\n",this,ip));
LOG((LF_CORDB,LL_INFO10000,"DS::TTC this:0x%x, @ ip:0x%x\n",this,ip));
TraceDestination trace;

if (IsFrozen())
{
LOG((LF_CORDB,LL_INFO10000,"DS:TTC exit b/c of Frozen\n"));
LOG((LF_CORDB,LL_INFO10000,"DS::TTC exit b/c of Frozen\n"));
return;
}

Expand Down Expand Up @@ -7573,7 +7567,7 @@ void DebuggerStepper::TriggerUnwind(Thread *thread,

if (IsFrozen())
{
LOG((LF_CORDB,LL_INFO10000,"DS:TTC exit b/c of Frozen\n"));
LOG((LF_CORDB,LL_INFO10000,"DS::TTC exit b/c of Frozen\n"));
return;
}

Expand Down Expand Up @@ -7853,7 +7847,7 @@ bool DebuggerJMCStepper::TrapStepInHelper(
SIZE_T offset = CodeRegionInfo::GetCodeRegionInfo(dji, pDesc).AddressToOffset(ipNext);


LOG((LF_CORDB, LL_INFO100000, "DJMCStepper::TSIH, at '%s::%s', calling=0x%p, next=0x%p, offset=%d\n",
LOG((LF_CORDB, LL_INFO100000, "DJMCStepper::TSIH, at '%s::%s', calling=%p, next=%p, offset=%d\n",
pDesc->m_pszDebugClassName,
pDesc->m_pszDebugMethodName,
ipCallTarget, ipNext,
Expand Down
Loading