Fix build break after rebase

diff --git a/src/vm/methodtable.cpp b/src/vm/methodtable.cpp
index 42cb886..404d903 100644 (file)
--- a/src/vm/methodtable.cpp
+++ b/src/vm/methodtable.cpp
@@ -7021,16 +7021,17 @@ BOOL MethodTable::FindDefaultMethod(
                             MethodDesc *pMD = methodIt.GetMethodDesc();
                             if (pMD->IsVirtual() && !pMD->IsAbstract() && pMD->IsMethodImpl())
                             {
-                                MethodImpl *pImpl = pMD->GetMethodImpl();
-                                MethodDesc **pImplMDs = pImpl->GetImplementedMDs();
-                                for (DWORD i = 0; i < pImpl->GetSize(); ++i)
+                                MethodImpl::Iterator it(pMD);
+                                while (it.IsValid())
                                 {
-                                    if (pImplMDs[i] == pInterfaceMD)
+                                    if (it.GetMethodDesc() == pInterfaceMD)
                                     {
                                         pCurMD = pMD;
                                         break;
                                     }
-                                }
+
+                                    it.Next();
+                                } 
                             }
                         }
                     }

diff --git a/src/vm/methodtablebuilder.cpp b/src/vm/methodtablebuilder.cpp
index b3aed49..2f76d7f 100644 (file)
--- a/src/vm/methodtablebuilder.cpp
+++ b/src/vm/methodtablebuilder.cpp
@@ -6192,7 +6192,7 @@ MethodTableBuilder::PlaceMethodImpls()
             {
                 // We implement this slot, record it
                 slots[slotIndex] = pCurDeclMethod->GetSlotIndex();
-                replaced[slotIndex] = pCurDeclMethod->GetMethodDesc();
+                replaced[slotIndex].SetValue(pCurDeclMethod->GetMethodDesc());
 
                 // increment the counter
                 slotIndex++;
@@ -6216,7 +6216,7 @@ MethodTableBuilder::PlaceMethodImpls()
             {
                 // We implement this slot, record it
                 slots[slotIndex] = pCurDeclMethod->GetSlotIndex();
-                replaced[slotIndex] = pCurDeclMethod->GetMethodDesc();
+                replaced[slotIndex].SetValue(pCurDeclMethod->GetMethodDesc());
 
                 // increment the counter
                 slotIndex++;