Delete dead code

- Delete BINDER, STANDALONE_BINDER and MDIL ifdefs

1 files changed, 0 insertions, 81 deletions

diff --git a/src/vm/fieldmarshaler.h b/src/vm/fieldmarshaler.h
index d1f1a011dd..3c06528499 100644
--- a/src/vm/fieldmarshaler.h
+++ b/src/vm/fieldmarshaler.h
@@ -18,32 +18,17 @@
 #ifndef __FieldMarshaler_h__
 #define __FieldMarshaler_h__
 
-#ifdef BINDER
-
-//TritonToDo: why don't we use the value from vm\<cpu>\cgencpu.h ??
-#if defined(_X86_) || defined(_ARM_)
-#define MAXFIELDMARSHALERSIZE 24
-#else
-#error "port field marshaler size"
-#endif
-
-typedef unsigned char U1;
-
-#else //BINDER
 #include "util.hpp"
 #include "mlinfo.h"
 #include "eeconfig.h"
 #include "olevariant.h"
-#endif // BINDER
 
 #ifdef FEATURE_COMINTEROP
 #endif  // FEATURE_COMINTEROP
 
-#ifndef BINDER
 #ifdef FEATURE_PREJIT
 #include "compile.h"
 #endif // FEATURE_PREJIT
-#endif // BINDER
 
 // Forward refernces
 class EEClassLayoutInfo;
@@ -276,11 +261,6 @@ VOID FmtValueTypeUpdateCLR(LPVOID pProtectedManagedData, MethodTable *pMT, BYTE
 
 class FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
-
 public:
     VOID UpdateNative(OBJECTREF* pCLRValue, LPVOID pNativeValue, OBJECTREF *ppCleanupWorkListOnStack) const;
     VOID UpdateCLR(const VOID *pNativeValue, OBJECTREF *ppProtectedCLRValue, OBJECTREF *ppProtectedOldCLRValue) const;
@@ -361,11 +341,9 @@ public:
         }
         CONTRACTL_END;
 
-#ifndef BINDER
 #ifdef FEATURE_PREJIT
         Module::RestoreFieldDescPointer(&m_pFD);
 #endif // FEATURE_PREJIT
-#endif // BINDER
     }
 
     void SetFieldDesc(FieldDesc* pFD)
@@ -422,14 +400,12 @@ protected:
         }
         CONTRACTL_END;
 
-#ifndef BINDER
 #ifdef FEATURE_PREJIT
         Module::RestoreMethodTablePointer(ppMT);
 #else // FEATURE_PREJIT
         // without NGEN we only have to make sure that the type is fully loaded
         ClassLoader::EnsureLoaded(ppMT->GetValue());
 #endif // FEATURE_PREJIT
-#endif // BINDER
     }
 
 #ifdef _DEBUG
@@ -488,11 +464,6 @@ public:
 //=======================================================================
 class FieldMarshaler_Nullable : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
-
 public:
 
     FieldMarshaler_Nullable(MethodTable* pMT)
@@ -613,10 +584,6 @@ public:
 //=======================================================================
 class FieldMarshaler_NestedLayoutClass : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     FieldMarshaler_NestedLayoutClass(MethodTable *pMT)
     {
@@ -691,10 +658,6 @@ private:
 //=======================================================================
 class FieldMarshaler_NestedValueClass : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     FieldMarshaler_NestedValueClass(MethodTable *pMT)
     {
@@ -800,10 +763,6 @@ public:
 //=======================================================================
 class FieldMarshaler_StringAnsi : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     FieldMarshaler_StringAnsi(BOOL BestFit, BOOL ThrowOnUnmappableChar) : 
         m_BestFitMap(!!BestFit), m_ThrowOnUnmappableChar(!!ThrowOnUnmappableChar)
@@ -840,10 +799,6 @@ private:
 //=======================================================================
 class FieldMarshaler_FixedStringUni : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     VOID UpdateNativeImpl(OBJECTREF* pCLRValue, LPVOID pNativeValue, OBJECTREF *ppCleanupWorkListOnStack) const;
     VOID UpdateCLRImpl(const VOID *pNativeValue, OBJECTREF *ppProtectedCLRValue, OBJECTREF *ppProtectedOldCLRValue) const;
@@ -867,10 +822,6 @@ private:
 //=======================================================================
 class FieldMarshaler_FixedStringAnsi : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     FieldMarshaler_FixedStringAnsi(UINT32 numChar, BOOL BestFitMap, BOOL ThrowOnUnmappableChar) :
         m_numchar(numChar), m_BestFitMap(!!BestFitMap), m_ThrowOnUnmappableChar(!!ThrowOnUnmappableChar)
@@ -908,10 +859,6 @@ private:
 //=======================================================================
 class FieldMarshaler_FixedCharArrayAnsi : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     FieldMarshaler_FixedCharArrayAnsi(UINT32 numElems, BOOL BestFit, BOOL ThrowOnUnmappableChar) :
         m_numElems(numElems), m_BestFitMap(!!BestFit), m_ThrowOnUnmappableChar(!!ThrowOnUnmappableChar)
@@ -949,10 +896,6 @@ private:
 //=======================================================================
 class FieldMarshaler_FixedArray : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     FieldMarshaler_FixedArray(IMDInternalImport *pMDImport, mdTypeDef cl, UINT32 numElems, VARTYPE vt, MethodTable* pElementMT);
 
@@ -965,12 +908,8 @@ public:
     {
         LIMITED_METHOD_CONTRACT;
 
-#ifdef BINDER
-        return 0;
-#else
         MethodTable *pElementMT = m_arrayType.GetValue().AsArray()->GetArrayElementTypeHandle().GetMethodTable();
         return OleVariant::GetElementSizeForVarType(m_vt, pElementMT) * m_numElems;
-#endif
     }
 
     TypeHandle GetElementTypeHandle() const
@@ -1014,14 +953,12 @@ public:
         }
         CONTRACTL_END;
 
-#ifndef BINDER
 #ifdef FEATURE_PREJIT
         Module::RestoreTypeHandlePointer(&m_arrayType);
 #else // FEATURE_PREJIT
         // without NGEN we only have to make sure that the type is fully loaded
         ClassLoader::EnsureLoaded(m_arrayType.GetValue());
 #endif // FEATURE_PREJIT
-#endif
         FieldMarshaler::RestoreImpl();
     }
 
@@ -1053,10 +990,6 @@ private:
 //=======================================================================
 class FieldMarshaler_SafeArray : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
 
     VOID UpdateNativeImpl(OBJECTREF* pCLRValue, LPVOID pNativeValue, OBJECTREF *ppCleanupWorkListOnStack) const;
@@ -1139,10 +1072,6 @@ private:
 //=======================================================================
 class FieldMarshaler_Delegate : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     FieldMarshaler_Delegate(MethodTable* pMT)
     {
@@ -1246,10 +1175,6 @@ public:
 //=======================================================================
 class FieldMarshaler_Interface : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
 
     VOID UpdateNativeImpl(OBJECTREF* pCLRValue, LPVOID pNativeValue, OBJECTREF *ppCleanupWorkListOnStack) const;
@@ -1594,10 +1519,6 @@ public:
 
 class FieldMarshaler_Ansi : public FieldMarshaler
 {
-#ifdef BINDER
-    friend class CompactTypeBuilder;
-    friend class MdilModule;
-#endif
 public:
     FieldMarshaler_Ansi(BOOL BestFitMap, BOOL ThrowOnUnmappableChar) :
         m_BestFitMap(!!BestFitMap), m_ThrowOnUnmappableChar(!!ThrowOnUnmappableChar)
@@ -1610,7 +1531,6 @@ public:
 
     SCALAR_MARSHALER_IMPL(sizeof(CHAR), sizeof(CHAR))
 
-#ifndef BINDER
     VOID ScalarUpdateNativeImpl(LPVOID pCLR, LPVOID pNative) const
     {
         CONTRACTL
@@ -1633,7 +1553,6 @@ public:
         
         *((char*)pNative) = c;
     }
-#endif
 
     VOID ScalarUpdateCLRImpl(const VOID *pNative, LPVOID pCLR) const
     {