diff options
author | Jan Kotas <jkotas@microsoft.com> | 2018-03-08 06:09:03 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-08 06:09:03 -0800 |
commit | 5e03df42d9fb2fe05a4246695128ddfb6e9ca7fd (patch) | |
tree | fa70a69b3489bc3164178edd376b4683123ebbec /src/classlibnative | |
parent | 5928c09ddc7ff9fb998ba3cae53db8d6d8c56b02 (diff) | |
download | coreclr-5e03df42d9fb2fe05a4246695128ddfb6e9ca7fd.tar.gz coreclr-5e03df42d9fb2fe05a4246695128ddfb6e9ca7fd.tar.bz2 coreclr-5e03df42d9fb2fe05a4246695128ddfb6e9ca7fd.zip |
Move String to shared corelib partition (#16749)
Diffstat (limited to 'src/classlibnative')
-rw-r--r-- | src/classlibnative/bcltype/stringnative.cpp | 108 | ||||
-rw-r--r-- | src/classlibnative/bcltype/stringnative.h | 10 |
2 files changed, 0 insertions, 118 deletions
diff --git a/src/classlibnative/bcltype/stringnative.cpp b/src/classlibnative/bcltype/stringnative.cpp index cc91d0169b..63eed7345a 100644 --- a/src/classlibnative/bcltype/stringnative.cpp +++ b/src/classlibnative/bcltype/stringnative.cpp @@ -31,114 +31,6 @@ #pragma optimize("tgy", on) #endif -// -// -// CONSTRUCTORS -// -// - -/*===========================StringInitSBytPtrPartialEx=========================== -**Action: Takes a byte *, startIndex, length, and encoding and turns this into a string. -**Returns: -**Arguments: -**Exceptions: -==============================================================================*/ - -FCIMPL5(Object *, COMString::StringInitSBytPtrPartialEx, StringObject *thisString, - I1 *ptr, INT32 startIndex, INT32 length, Object *encoding) -{ - CONTRACTL - { - FCALL_CHECK; - PRECONDITION(thisString == 0); - PRECONDITION(ptr != NULL); - } CONTRACTL_END; - - STRINGREF pString = NULL; - VALIDATEOBJECT(encoding); - - HELPER_METHOD_FRAME_BEGIN_RET_1(encoding); - MethodDescCallSite createString(METHOD__STRING__CREATE_STRING); - - ARG_SLOT args[] = { - PtrToArgSlot(ptr), - startIndex, - length, - ObjToArgSlot(ObjectToOBJECTREF(encoding)), - }; - - pString = createString.Call_RetSTRINGREF(args); - HELPER_METHOD_FRAME_END(); - return OBJECTREFToObject(pString); -} -FCIMPLEND - -/*==============================StringInitCharPtr=============================== -**Action: -**Returns: -**Arguments: -**Exceptions: -==============================================================================*/ -FCIMPL2(Object *, COMString::StringInitCharPtr, StringObject *stringThis, INT8 *ptr) -{ - FCALL_CONTRACT; - - _ASSERTE(stringThis == 0); // This is the constructor - Object *result = NULL; - HELPER_METHOD_FRAME_BEGIN_RET_0(); - result = OBJECTREFToObject(StringObject::StringInitCharHelper((LPCSTR)ptr, -1)); - HELPER_METHOD_FRAME_END(); - return result; -} -FCIMPLEND - -/*===========================StringInitCharPtrPartial=========================== -**Action: -**Returns: -**Arguments: -**Exceptions: -==============================================================================*/ -FCIMPL4(Object *, COMString::StringInitCharPtrPartial, StringObject *stringThis, INT8 *value, - INT32 startIndex, INT32 length) -{ - CONTRACTL - { - FCALL_CHECK; - PRECONDITION(stringThis ==0); - } CONTRACTL_END; - - STRINGREF pString = NULL; - - //Verify the args. - if (startIndex<0) { - FCThrowArgumentOutOfRange(W("startIndex"), W("ArgumentOutOfRange_StartIndex")); - } - - if (length<0) { - FCThrowArgumentOutOfRange(W("length"), W("ArgumentOutOfRange_NegativeLength")); - } - - // This is called directly now. There is no check in managed code. - if( value == NULL) { - FCThrowArgumentNull(W("value")); - } - - LPCSTR pBase = (LPCSTR)value; - LPCSTR pFrom = pBase + startIndex; - if (pFrom < pBase) { - // Check for overflow of pointer addition - FCThrowArgumentOutOfRange(W("startIndex"), W("ArgumentOutOfRange_PartialWCHAR")); - } - - HELPER_METHOD_FRAME_BEGIN_RET_0(); - - pString = StringObject::StringInitCharHelper(pFrom, length); - HELPER_METHOD_FRAME_END(); - - return OBJECTREFToObject(pString); -} -FCIMPLEND - inline COMNlsHashProvider * GetCurrentNlsHashProvider() { LIMITED_METHOD_CONTRACT; diff --git a/src/classlibnative/bcltype/stringnative.h b/src/classlibnative/bcltype/stringnative.h index 53b7b863a6..f0df0503e5 100644 --- a/src/classlibnative/bcltype/stringnative.h +++ b/src/classlibnative/bcltype/stringnative.h @@ -41,16 +41,6 @@ class COMString { public: - - // - // Constructors - // - static FCDECL5(Object *, StringInitSBytPtrPartialEx, StringObject *thisString, - I1 *ptr, INT32 startIndex, INT32 length, Object* encoding); - static FCDECL2(Object *, StringInitCharPtr, StringObject *stringThis, INT8 *ptr); - static FCDECL4(Object *, StringInitCharPtrPartial, StringObject *stringThis, INT8 *value, - INT32 startIndex, INT32 length); - // // Search/Query Methods // |