diff options
| author | Aditya Mandaleeka <adityam@microsoft.com> | 2017-04-06 18:11:57 -0700 |
|---|---|---|
| committer | Aditya Mandaleeka <adityam@microsoft.com> | 2017-04-07 15:02:04 -0700 |
| commit | 447521434ab80ea97a42108a429e3773e71f7c66 (patch) | |
| tree | 8411a0922e136ef7f9fe702e66f6acba9ae7b882 /src | |
| parent | 7721f89f517f09f90d46a1078f0d26caf3b310c0 (diff) | |
| download | coreclr-447521434ab80ea97a42108a429e3773e71f7c66.tar.gz coreclr-447521434ab80ea97a42108a429e3773e71f7c66.tar.bz2 coreclr-447521434ab80ea97a42108a429e3773e71f7c66.zip | |
Move OBJECTHANDLE definition to gcinterface.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/gc/env/gcenv.base.h | 10 | ||||
| -rw-r--r-- | src/gc/gcinterface.h | 12 | ||||
| -rw-r--r-- | src/vm/vars.hpp | 19 |
3 files changed, 14 insertions, 27 deletions
diff --git a/src/gc/env/gcenv.base.h b/src/gc/env/gcenv.base.h index f5e730d887..2ce07ef157 100644 --- a/src/gc/env/gcenv.base.h +++ b/src/gc/env/gcenv.base.h @@ -328,16 +328,6 @@ typedef PTR_PTR_Object PTR_OBJECTREF; typedef PTR_Object _UNCHECKED_OBJECTREF; typedef PTR_PTR_Object PTR_UNCHECKED_OBJECTREF; -#ifndef DACCESS_COMPILE -struct OBJECTHANDLE__ -{ - void* unused; -}; -typedef struct OBJECTHANDLE__* OBJECTHANDLE; -#else -typedef TADDR OBJECTHANDLE; -#endif - // With no object reference wrapping the following macros are very simple. #define ObjectToOBJECTREF(_obj) (OBJECTREF)(_obj) #define OBJECTREFToObject(_obj) (Object*)(_obj) diff --git a/src/gc/gcinterface.h b/src/gc/gcinterface.h index 2fe9b3a1ef..92c3e8b10f 100644 --- a/src/gc/gcinterface.h +++ b/src/gc/gcinterface.h @@ -385,6 +385,18 @@ typedef void (* record_surv_fn)(uint8_t* begin, uint8_t* end, ptrdiff_t reloc, v typedef void (* fq_walk_fn)(bool, void*); typedef void (* fq_scan_fn)(Object** ppObject, ScanContext *pSC, uint32_t dwFlags); typedef void (* handle_scan_fn)(Object** pRef, Object* pSec, uint32_t flags, ScanContext* context, bool isDependent); + +// Opaque type for tracking object pointers +#ifndef DACCESS_COMPILE +struct OBJECTHANDLE__ +{ + void* unused; +}; +typedef struct OBJECTHANDLE__* OBJECTHANDLE; +#else +typedef uintptr_t OBJECTHANDLE; +#endif + class IGCHandleTable { public: diff --git a/src/vm/vars.hpp b/src/vm/vars.hpp index a72f414f1f..391fa4335b 100644 --- a/src/vm/vars.hpp +++ b/src/vm/vars.hpp @@ -72,6 +72,8 @@ typedef unsigned short wchar_t; #include "profilepriv.h" +#include "gcinterface.h" + class ClassLoader; class LoaderHeap; class IGCHeap; @@ -98,23 +100,6 @@ class BBSweep; struct IAssemblyUsageLog; // -// object handles are opaque types that track object pointers -// -#ifndef DACCESS_COMPILE - -struct OBJECTHANDLE__ -{ - void* unused; -}; -typedef struct OBJECTHANDLE__* OBJECTHANDLE; - -#else - -typedef TADDR OBJECTHANDLE; - -#endif - -// // loader handles are opaque types that track object pointers that have a lifetime // that matches that of a loader allocator // |