Delete dead code

- Delete BINDER, STANDALONE_BINDER and MDIL ifdefs

1 files changed, 9 insertions, 52 deletions

diff --git a/src/zap/zapcode.cpp b/src/zap/zapcode.cpp
index d2cf3827b2..2e7f21590a 100644
--- a/src/zap/zapcode.cpp
+++ b/src/zap/zapcode.cpp
@@ -345,14 +345,9 @@ void ZapImage::OutputCode(CodeType codeType)
 
             ZapNode * pUnwindData = pUnwindInfo->GetUnwindData();
 
-#if defined(BINDER) && defined(TARGET_THUMB2)
-            if (pUnwindData != NULL)
-#endif
+            if (!pUnwindData->IsPlaced())
             {
-                if (!pUnwindData->IsPlaced())
-                {
-                    pUnwindDataSection->Place(pUnwindData);
-                }
+                pUnwindDataSection->Place(pUnwindData);
             }
         }
 
@@ -468,10 +463,8 @@ void ZapImage::OutputCodeInfo(CodeType codeType)
         }
 #endif // REDHAWK
 
-#ifndef BINDER // in the binder, shift this to an earlier phase because of phase ordering problem (FlushPrecodesAndMethodDescs needs this)
         if (pMethod->m_pFixupList != NULL && !IsReadyToRunCompilation())
             pMethod->m_pFixupInfo = m_pImportTable->PlaceFixups(pMethod->m_pFixupList);
-#endif
     }
 
     EndRegion(regionKind);
@@ -1170,32 +1163,18 @@ void ZapCodeMethodDescs::Save(ZapWriter * pZapWriter)
 
 void ZapMethodEntryPoint::Resolve(ZapImage * pImage)
 {
-#ifdef CLR_STANDALONE_BINDER
-    if (m_pEntryPoint != NULL)
+    DWORD rvaValue = pImage->m_pPreloader->MapMethodEntryPoint(GetHandle());
+#ifdef _DEBUG
+    if (rvaValue == NULL)
     {
-        if (m_pEntryPoint->GetType() == ZapNodeType_InnerPtr)
-        {
-            ZapInnerPtr *pInnerPtr = (ZapInnerPtr *)m_pEntryPoint;
-            pInnerPtr->Resolve();
-        }
-        SetRVA(m_pEntryPoint->GetRVA());
+        mdMethodDef token;
+        pImage->GetCompileInfo()->GetMethodDef(GetHandle(), &token);
+        pImage->Error(token, S_OK, W("MapMethodEntryPoint failed"));
     }
     else
 #endif
     {
-        DWORD rvaValue = pImage->m_pPreloader->MapMethodEntryPoint(GetHandle());
-#ifdef _DEBUG
-        if (rvaValue == NULL)
-        {
-            mdMethodDef token;
-            pImage->GetCompileInfo()->GetMethodDef(GetHandle(), &token);
-            pImage->Error(token, S_OK, W("MapMethodEntryPoint failed"));
-        }
-        else
-#endif
-        {
-            SetRVA(rvaValue);
-        }
+        SetRVA(rvaValue);
     }
 }
 
@@ -1239,11 +1218,9 @@ ZapNode * ZapMethodEntryPointTable::CanDirectCall(ZapMethodEntryPoint * pMethodE
     if (m_pImage->canIntraModuleDirectCall(caller, callee, &reason, pMethodEntryPoint->GetAccessFlags()))
     {
         ZapNode * pCode = m_pImage->GetCompiledMethod(callee)->GetCode();
-#ifndef BINDER
 #ifdef _TARGET_ARM_
         pCode = m_pImage->GetInnerPtr(pCode, THUMB_CODE);
 #endif // _TARGET_ARM_
-#endif // BINDER
         return pCode;
     }
     else
@@ -1449,10 +1426,6 @@ void ZapUnwindData::Save(ZapWriter * pZapWriter)
         pZapWriter->WritePad(dwPad);
 
     ULONG personalityRoutine = GetPersonalityRoutine(pImage)->GetRVA();
-#ifdef BINDER
-    _ASSERTE((personalityRoutine & THUMB_CODE) == 0);
-    personalityRoutine |= THUMB_CODE;
-#endif
     pZapWriter->Write(&personalityRoutine, sizeof(personalityRoutine));
 }
 
@@ -1649,22 +1622,6 @@ void ZapDebugInfoTable::LabelledEntry::Save(ZapWriter * pZapWriter)
     pZapWriter->Write(&entry, sizeof(entry));
 }
 
-#ifdef MDIL
-const MdilDebugInfoTable::DebugInfo *MdilDebugInfoTable::GetDebugInfo(COUNT_T offset, COUNT_T cbBlob, const SArray<BYTE> *pBuf)
-{
-    DebugInfo info(offset, cbBlob, pBuf);
-    DebugInfo *pNode = m_blobs.Lookup(&info);
-    if (pNode != NULL)
-    {
-        return pNode;
-    }
-
-    pNode = new (m_pImage->GetHeap()) DebugInfo(offset, cbBlob, pBuf);
-    m_blobs.Add(pNode);
-    return pNode;
-}
-#endif // MDIL
-
 //
 // ZapProfileData
 //