summaryrefslogtreecommitdiff
path: root/src/vm
diff options
context:
space:
mode:
authorEgor Bogatov <egorbo@gmail.com>2019-04-30 05:21:04 +0300
committerJan Kotas <jkotas@microsoft.com>2019-04-29 19:21:04 -0700
commitb169f91d204e2b9e6e760d1b46579556bd20f492 (patch)
tree3dd5d13bb71c78a4581e9b0cd11e44920a6abd73 /src/vm
parent8f54d67f5f5a451ce43f1a70a1fc5fd0e4e469f9 (diff)
downloadcoreclr-b169f91d204e2b9e6e760d1b46579556bd20f492.tar.gz
coreclr-b169f91d204e2b9e6e760d1b46579556bd20f492.tar.bz2
coreclr-b169f91d204e2b9e6e760d1b46579556bd20f492.zip
Move DefaultBinder.CanConvert.cs to shared (#23931)
Diffstat (limited to 'src/vm')
-rw-r--r--src/vm/ecalllist.h6
-rw-r--r--src/vm/reflectioninvocation.cpp32
-rw-r--r--src/vm/reflectioninvocation.h8
3 files changed, 1 insertions, 45 deletions
diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h
index 4d9de5b4b9..34aead9373 100644
--- a/src/vm/ecalllist.h
+++ b/src/vm/ecalllist.h
@@ -345,11 +345,6 @@ FCFuncStart(gRuntimeMethodHandle)
FCFuncElement("GetLoaderAllocator", RuntimeMethodHandle::GetLoaderAllocator)
FCFuncEnd()
-FCFuncStart(gCOMDefaultBinderFuncs)
- FCFuncElement("CanConvertPrimitive", ReflectionBinder::DBCanConvertPrimitive)
- FCFuncElement("CanConvertPrimitiveObjectToType", ReflectionBinder::DBCanConvertObjectPrimitive)
-FCFuncEnd()
-
FCFuncStart(gCOMFieldHandleNewFuncs)
FCFuncElement("GetValue", RuntimeFieldHandle::GetValue)
@@ -1209,7 +1204,6 @@ FCClassElement("CustomAttributeEncodedArgument", "System.Reflection", gCustomAtt
FCClassElement("DateMarshaler", "System.StubHelpers", gDateMarshalerFuncs)
FCClassElement("DateTime", "System", gDateTimeFuncs)
FCClassElement("Debugger", "System.Diagnostics", gDiagnosticsDebugger)
-FCClassElement("DefaultBinder", "System", gCOMDefaultBinderFuncs)
FCClassElement("Delegate", "System", gDelegateFuncs)
FCClassElement("DependentHandle", "System.Runtime.CompilerServices", gDependentHandleFuncs)
FCClassElement("Enum", "System", gEnumFuncs)
diff --git a/src/vm/reflectioninvocation.cpp b/src/vm/reflectioninvocation.cpp
index 3d45ef257a..219d40fba0 100644
--- a/src/vm/reflectioninvocation.cpp
+++ b/src/vm/reflectioninvocation.cpp
@@ -2886,41 +2886,11 @@ FCIMPLEND
//*************************************************************************************************
//*************************************************************************************************
//*************************************************************************************************
-// ReflectionBinder
+// ReflectionEnum
//*************************************************************************************************
//*************************************************************************************************
//*************************************************************************************************
-FCIMPL2(FC_BOOL_RET, ReflectionBinder::DBCanConvertPrimitive, ReflectClassBaseObject* source, ReflectClassBaseObject* target) {
- FCALL_CONTRACT;
-
- VALIDATEOBJECT(source);
- VALIDATEOBJECT(target);
-
- CorElementType tSRC = source->GetType().GetSignatureCorElementType();
- CorElementType tTRG = target->GetType().GetSignatureCorElementType();
-
- FC_RETURN_BOOL(InvokeUtil::IsPrimitiveType(tTRG) && InvokeUtil::CanPrimitiveWiden(tTRG, tSRC));
-}
-FCIMPLEND
-
-FCIMPL2(FC_BOOL_RET, ReflectionBinder::DBCanConvertObjectPrimitive, Object* sourceObj, ReflectClassBaseObject* target) {
- FCALL_CONTRACT;
-
- VALIDATEOBJECT(sourceObj);
- VALIDATEOBJECT(target);
-
- if (sourceObj == 0)
- FC_RETURN_BOOL(true);
-
- TypeHandle th(sourceObj->GetMethodTable());
- CorElementType tSRC = th.GetVerifierCorElementType();
-
- CorElementType tTRG = target->GetType().GetSignatureCorElementType();
- FC_RETURN_BOOL(InvokeUtil::IsPrimitiveType(tTRG) && InvokeUtil::CanPrimitiveWiden(tTRG, tSRC));
-}
-FCIMPLEND
-
FCIMPL2(FC_BOOL_RET, ReflectionEnum::InternalEquals, Object *pRefThis, Object* pRefTarget)
{
FCALL_CONTRACT;
diff --git a/src/vm/reflectioninvocation.h b/src/vm/reflectioninvocation.h
index 7cb3348292..0b4b7692f7 100644
--- a/src/vm/reflectioninvocation.h
+++ b/src/vm/reflectioninvocation.h
@@ -102,12 +102,4 @@ public:
static FCDECL2(int, InternalCompareTo, Object *pRefThis, Object* pRefTarget);
};
-class ReflectionBinder {
-public:
- static FCDECL2(FC_BOOL_RET, DBCanConvertPrimitive, ReflectClassBaseObject* vSource, ReflectClassBaseObject* vTarget);
- static FCDECL2(FC_BOOL_RET, DBCanConvertObjectPrimitive, Object* vSourceObj, ReflectClassBaseObject* vTarget);
-
-
-};
-
#endif // _REFLECTIONINVOCATION_H_