Skip to content

Commit 27fcddc

Browse files
committed
fixup rebase
1 parent 7517e32 commit 27fcddc

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/native/managed/cdacreader/src/Contracts/RuntimeTypeSystem_1.NonValidated.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ private bool ValidateMethodDescPointer(TargetPointer methodDescPointer, [NotNull
257257
{
258258
return false;
259259
}
260-
MethodTableHandle methodTableHandle = GetMethodTableHandle(methodTablePointer);
260+
TypeHandle typeHandle = GetTypeHandle(methodTablePointer);
261261

262-
if (umd.Slot >= GetNumVtableSlots(methodTableHandle) && !umd.HasNonVtableSlot)
262+
if (umd.Slot >= GetNumVtableSlots(typeHandle) && !umd.HasNonVtableSlot)
263263
{
264264
return false;
265265
}

src/native/managed/cdacreader/src/Contracts/RuntimeTypeSystem_1.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,12 +446,13 @@ private FunctionPointerRetAndArgs(Target target, TargetPointer typePointer)
446446
TypeHandles[i] = rts.GetTypeHandle(target.ReadPointer(retAndArgs + (ulong)target.PointerSize * (ulong)i));
447447
}
448448
}
449+
}
449450

450-
internal ushort GetNumVtableSlots(TypeHandleHandle typeHandle)
451+
internal ushort GetNumVtableSlots(TypeHandle typeHandle)
451452
{
452453
if (!typeHandle.IsMethodTable())
453454
return 0;
454-
MethodTable methodTable = _methodTables[typeHandleHandle.Address];
455+
MethodTable methodTable = _methodTables[typeHandle.Address];
455456
ushort numNonVirtualSlots = methodTable.IsCanonMT ? GetClassData(typeHandle).NumNonVirtualSlots : (ushort)0;
456457
return checked((ushort)(methodTable.NumVirtuals + numNonVirtualSlots));
457458
}

src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public unsafe int GetMethodDescData(ulong methodDesc, ulong ip, DacpMethodDescDa
104104

105105
return HResults.E_NOTIMPL;
106106
}
107-
catch (Exception ex)
107+
catch (global::System.Exception ex)
108108
{
109109
return ex.HResult;
110110
}

0 commit comments

Comments
 (0)