diff options
author | David Wrighton <davidwr@microsoft.com> | 2019-04-03 15:54:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-03 15:54:05 -0700 |
commit | d3e39bc2f81e3dbf9e4b96347f62b49d8700336c (patch) | |
tree | 78b72499a0f38e9dbf6ae4d6d24c77779ac543dc /src/classlibnative | |
parent | a7dd6192530dec1d424c359233a1b92f559fa92a (diff) | |
download | coreclr-d3e39bc2f81e3dbf9e4b96347f62b49d8700336c.tar.gz coreclr-d3e39bc2f81e3dbf9e4b96347f62b49d8700336c.tar.bz2 coreclr-d3e39bc2f81e3dbf9e4b96347f62b49d8700336c.zip |
Remove ADID and ADIndex from CoreCLR (#23588)
- Remove concept of AppDomain from object api in VM
- Various infrastructure around entering/leaving appdomains is removed
- Add small implementation of GetAppDomain for use by DAC (to match existing behavior)
- Simplify finalizer thread operations
- Eliminate AppDomain::Terminate
- Remove use of ADID from stresslog
- Remove thread enter/leave tracking from AppDomain
- Remove unused asm constants across all architectures
- Re-order header inclusion order to put gcenv.h before handletable
- Remove retail only sync block code involving appdomain index
Diffstat (limited to 'src/classlibnative')
-rw-r--r-- | src/classlibnative/bcltype/arraynative.cpp | 8 | ||||
-rw-r--r-- | src/classlibnative/bcltype/objectnative.cpp | 2 | ||||
-rw-r--r-- | src/classlibnative/bcltype/system.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/classlibnative/bcltype/arraynative.cpp b/src/classlibnative/bcltype/arraynative.cpp index c99cb5c21e..528105a476 100644 --- a/src/classlibnative/bcltype/arraynative.cpp +++ b/src/classlibnative/bcltype/arraynative.cpp @@ -485,7 +485,7 @@ void ArrayNative::CastCheckEachElement(const BASEARRAYREF pSrcUnsafe, const unsi COMPlusThrow(kInvalidCastException, W("InvalidCast_DownCastArrayElement")); OBJECTREF * destData = (OBJECTREF*)(gc.pDest->GetDataPtr()) + i - srcIndex + destIndex; - SetObjectReference(destData, gc.obj, gc.pDest->GetAppDomain()); + SetObjectReference(destData, gc.obj); } GCPROTECT_END(); @@ -558,7 +558,7 @@ void ArrayNative::BoxEachElement(BASEARRAYREF pSrc, unsigned int srcIndex, BASEA gc.obj = pSrcMT->FastBox(&srcPtr); OBJECTREF * destData = (OBJECTREF*)((gc.dest)->GetDataPtr()) + i; - SetObjectReference(destData, gc.obj, gc.dest->GetAppDomain()); + SetObjectReference(destData, gc.obj); } GCPROTECT_END(); GCPROTECT_END(); @@ -1323,7 +1323,7 @@ FCIMPL2(void, ArrayNative::SetValue, TypedByRef * target, Object* objUNSAFE) if (thTarget == TypeHandle(g_pObjectClass)) { // Everything is compatible with Object - SetObjectReference((OBJECTREF*)target->data,(OBJECTREF)obj,GetAppDomain()); + SetObjectReference((OBJECTREF*)target->data,(OBJECTREF)obj); } else if (!pTargetMT->IsValueType()) @@ -1339,7 +1339,7 @@ FCIMPL2(void, ArrayNative::SetValue, TypedByRef * target, Object* objUNSAFE) HELPER_METHOD_FRAME_END(); } - SetObjectReference((OBJECTREF*)target->data,obj,GetAppDomain()); + SetObjectReference((OBJECTREF*)target->data,obj); } else { diff --git a/src/classlibnative/bcltype/objectnative.cpp b/src/classlibnative/bcltype/objectnative.cpp index 64914d8807..5304e0110e 100644 --- a/src/classlibnative/bcltype/objectnative.cpp +++ b/src/classlibnative/bcltype/objectnative.cpp @@ -60,7 +60,7 @@ FCIMPL1(Object*, ObjectNative::GetObjectValue, Object* obj) // MethodTable::Box is a cleaner way to copy value class, but it is slower than following code. // retVal = OBJECTREFToObject(AllocateObject(pMT)); - CopyValueClass(retVal->GetData(), objRef->GetData(), pMT, retVal->GetAppDomain()); + CopyValueClass(retVal->GetData(), objRef->GetData(), pMT); HELPER_METHOD_FRAME_END(); return(retVal); diff --git a/src/classlibnative/bcltype/system.cpp b/src/classlibnative/bcltype/system.cpp index 8f3b428a58..12397a330e 100644 --- a/src/classlibnative/bcltype/system.cpp +++ b/src/classlibnative/bcltype/system.cpp @@ -277,7 +277,7 @@ FCIMPL0(Object*, SystemNative::GetCommandLineArgs) { STRINGREF str = StringObject::NewString(argv[i]); STRINGREF * destData = ((STRINGREF*)(strArray->GetDataPtr())) + i; - SetObjectReference((OBJECTREF*)destData, (OBJECTREF)str, strArray->GetAppDomain()); + SetObjectReference((OBJECTREF*)destData, (OBJECTREF)str); } delete [] argv; |