fixup rebase

Author: lambdageek

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

@@ -257,9 +257,9 @@ private bool ValidateMethodDescPointer(TargetPointer methodDescPointer, [NotNull
             {
                 return false;
             }
-            MethodTableHandle methodTableHandle = GetMethodTableHandle(methodTablePointer);
+            TypeHandle typeHandle = GetTypeHandle(methodTablePointer);
 
-            if (umd.Slot >= GetNumVtableSlots(methodTableHandle) && !umd.HasNonVtableSlot)
+            if (umd.Slot >= GetNumVtableSlots(typeHandle) && !umd.HasNonVtableSlot)
             {
                 return false;
             }

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

@@ -446,12 +446,13 @@ private FunctionPointerRetAndArgs(Target target, TargetPointer typePointer)
                 TypeHandles[i] = rts.GetTypeHandle(target.ReadPointer(retAndArgs + (ulong)target.PointerSize * (ulong)i));
             }
         }
+    }
 
-    internal ushort GetNumVtableSlots(TypeHandleHandle typeHandle)
+    internal ushort GetNumVtableSlots(TypeHandle typeHandle)
     {
         if (!typeHandle.IsMethodTable())
             return 0;
-        MethodTable methodTable = _methodTables[typeHandleHandle.Address];
+        MethodTable methodTable = _methodTables[typeHandle.Address];
         ushort numNonVirtualSlots = methodTable.IsCanonMT ? GetClassData(typeHandle).NumNonVirtualSlots : (ushort)0;
         return checked((ushort)(methodTable.NumVirtuals + numNonVirtualSlots));
     }

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

@@ -104,7 +104,7 @@ public unsafe int GetMethodDescData(ulong methodDesc, ulong ip, DacpMethodDescDa
 
             return HResults.E_NOTIMPL;
         }
-        catch (Exception ex)
+        catch (global::System.Exception ex)
         {
             return ex.HResult;
         }