SUPPORTS_DAC;
COUNT_T countNativeVarInfo;
NewHolder<ICorDebugInfo::NativeVarInfo> nativeVars(NULL);
-
- NativeCodeVersion requestedNativeCodeVersion = ExecutionManager::GetNativeCodeVersion(address);
- if (requestedNativeCodeVersion.IsNull() || requestedNativeCodeVersion.GetNativeCode() == NULL)
+ TADDR nativeCodeStartAddr;
+ if (address != NULL)
{
- return E_INVALIDARG;
+ NativeCodeVersion requestedNativeCodeVersion = ExecutionManager::GetNativeCodeVersion(address);
+ if (requestedNativeCodeVersion.IsNull() || requestedNativeCodeVersion.GetNativeCode() == NULL)
+ {
+ return E_INVALIDARG;
+ }
+ nativeCodeStartAddr = PCODEToPINSTR(requestedNativeCodeVersion.GetNativeCode());
+ }
+ else
+ {
+ nativeCodeStartAddr = PCODEToPINSTR(methodDesc->GetNativeCode());
}
- TADDR nativeCodeStartAddr = PCODEToPINSTR(requestedNativeCodeVersion.GetNativeCode());
DebugInfoRequest request;
request.InitFromStartingAddr(methodDesc, nativeCodeStartAddr);
// Use the DebugInfoStore to get IL->Native maps.
// It doesn't matter whether we're jitted, ngenned etc.
-
- NativeCodeVersion requestedNativeCodeVersion = ExecutionManager::GetNativeCodeVersion(address);
- if (requestedNativeCodeVersion.IsNull() || requestedNativeCodeVersion.GetNativeCode() == NULL)
+ TADDR nativeCodeStartAddr;
+ if (address != NULL)
{
- return E_INVALIDARG;
+ NativeCodeVersion requestedNativeCodeVersion = ExecutionManager::GetNativeCodeVersion(address);
+ if (requestedNativeCodeVersion.IsNull() || requestedNativeCodeVersion.GetNativeCode() == NULL)
+ {
+ return E_INVALIDARG;
+ }
+ nativeCodeStartAddr = PCODEToPINSTR(requestedNativeCodeVersion.GetNativeCode());
+ }
+ else
+ {
+ nativeCodeStartAddr = PCODEToPINSTR(methodDesc->GetNativeCode());
}
- TADDR nativeCodeStartAddr = PCODEToPINSTR(requestedNativeCodeVersion.GetNativeCode());
DebugInfoRequest request;
request.InitFromStartingAddr(methodDesc, nativeCodeStartAddr);