From 48ec2b058e182a0191af04ca7cb400e53e273b64 Mon Sep 17 00:00:00 2001 From: David Mason Date: Fri, 30 Mar 2018 23:35:38 -0700 Subject: [PATCH] fix for HasCriticalFinalizer in local gc (#17369) --- src/gc/env/gcenv.object.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gc/env/gcenv.object.h b/src/gc/env/gcenv.object.h index dd152f2..191c7a1 100644 --- a/src/gc/env/gcenv.object.h +++ b/src/gc/env/gcenv.object.h @@ -36,11 +36,12 @@ public: static_assert(sizeof(ObjHeader) == sizeof(uintptr_t), "this assumption is made by the VM!"); -#define MTFlag_ContainsPointers 0x0100 -#define MTFlag_HasFinalizer 0x0010 -#define MTFlag_IsArray 0x0008 -#define MTFlag_Collectible 0x1000 -#define MTFlag_HasComponentSize 0x8000 +#define MTFlag_ContainsPointers 0x0100 +#define MTFlag_HasCriticalFinalizer 0x0800 +#define MTFlag_HasFinalizer 0x0010 +#define MTFlag_IsArray 0x0008 +#define MTFlag_Collectible 0x1000 +#define MTFlag_HasComponentSize 0x8000 class MethodTable { @@ -103,7 +104,7 @@ public: bool HasCriticalFinalizer() { - return false; + return (m_flags & MTFlag_HasCriticalFinalizer) != 0; } bool IsArray() -- 2.7.4