From 5d1acb06a0d426928cb8c9881ccd2400fe57abce Mon Sep 17 00:00:00 2001 From: John Salem Date: Wed, 24 Oct 2018 20:29:40 -0700 Subject: Add IsCollectible property to Assembly and necessary backing functions (#20574) --- src/vm/assemblynative.cpp | 15 +++++++++++++++ src/vm/assemblynative.hpp | 2 ++ src/vm/ecalllist.h | 1 + 3 files changed, 18 insertions(+) (limited to 'src/vm') diff --git a/src/vm/assemblynative.cpp b/src/vm/assemblynative.cpp index e658f25822..89e6768c33 100644 --- a/src/vm/assemblynative.cpp +++ b/src/vm/assemblynative.cpp @@ -730,6 +730,21 @@ BOOL QCALLTYPE AssemblyNative::GetNeutralResourcesLanguageAttribute(QCall::Assem return retVal; } +BOOL QCALLTYPE AssemblyNative::GetIsCollectible(QCall::AssemblyHandle pAssembly) +{ + QCALL_CONTRACT; + + BOOL retVal = FALSE; + + BEGIN_QCALL; + + retVal = pAssembly->IsCollectible(); + + END_QCALL; + + return retVal; +} + void QCALLTYPE AssemblyNative::GetModule(QCall::AssemblyHandle pAssembly, LPCWSTR wszFileName, QCall::ObjectHandleOnStack retModule) { QCALL_CONTRACT; diff --git a/src/vm/assemblynative.hpp b/src/vm/assemblynative.hpp index 0bdb2c31ed..8ae1fe57c5 100644 --- a/src/vm/assemblynative.hpp +++ b/src/vm/assemblynative.hpp @@ -113,6 +113,8 @@ public: static void QCALLTYPE GetImageRuntimeVersion(QCall::AssemblyHandle pAssembly, QCall::StringHandleOnStack retString); + static BOOL QCALLTYPE GetIsCollectible(QCall::AssemblyHandle pAssembly); + // // PEFile QCalls // diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index ac5794e7f7..e168886aca 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -538,6 +538,7 @@ FCFuncStart(gAssemblyFuncs) QCFuncElement("GetImageRuntimeVersion", AssemblyNative::GetImageRuntimeVersion) FCFuncElement("GetManifestModule", AssemblyHandle::GetManifestModule) FCFuncElement("GetToken", AssemblyHandle::GetToken) + QCFuncElement("GetIsCollectible", AssemblyNative::GetIsCollectible) FCFuncEnd() FCFuncStart(gAssemblyExtensionsFuncs) -- cgit v1.2.3