From 7412ffa41f509be5a5f05c4f67984be0a5c7ad08 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Wed, 4 Nov 2020 19:33:06 -0800 Subject: [PATCH] Remove unused QCall for WinRTSupported --- .../src/classlibnative/bcltype/system.cpp | 17 ----------------- src/coreclr/src/classlibnative/bcltype/system.h | 5 ----- src/coreclr/src/vm/ecalllist.h | 3 --- 3 files changed, 25 deletions(-) diff --git a/src/coreclr/src/classlibnative/bcltype/system.cpp b/src/coreclr/src/classlibnative/bcltype/system.cpp index 74623125fdf49d..3660c14963df99 100644 --- a/src/coreclr/src/classlibnative/bcltype/system.cpp +++ b/src/coreclr/src/classlibnative/bcltype/system.cpp @@ -590,23 +590,6 @@ FCIMPL0(FC_BOOL_RET, SystemNative::IsServerGC) } FCIMPLEND -#ifdef FEATURE_COMINTEROP - -BOOL QCALLTYPE SystemNative::WinRTSupported() -{ - QCALL_CONTRACT; - - BOOL hasWinRT = FALSE; - - BEGIN_QCALL; - hasWinRT = ::WinRTSupported(); - END_QCALL; - - return hasWinRT; -} - -#endif // FEATURE_COMINTEROP - #if defined(TARGET_X86) || defined(TARGET_AMD64) void QCALLTYPE SystemNative::X86BaseCpuId(int cpuInfo[4], int functionId, int subFunctionId) diff --git a/src/coreclr/src/classlibnative/bcltype/system.h b/src/coreclr/src/classlibnative/bcltype/system.h index ff6720f0a8c09f..5bbf73d4a1048d 100644 --- a/src/coreclr/src/classlibnative/bcltype/system.h +++ b/src/coreclr/src/classlibnative/bcltype/system.h @@ -73,11 +73,6 @@ class SystemNative static FCDECL0(FC_BOOL_RET, IsServerGC); -#ifdef FEATURE_COMINTEROP - static - BOOL QCALLTYPE WinRTSupported(); -#endif // FEATURE_COMINTEROP - // Return a method info for the method were the exception was thrown static FCDECL1(ReflectMethodObject*, GetMethodFromStackTrace, ArrayBase* pStackTraceUNSAFE); diff --git a/src/coreclr/src/vm/ecalllist.h b/src/coreclr/src/vm/ecalllist.h index 76a1ccc3ad5db6..804c0619e887e7 100644 --- a/src/coreclr/src/vm/ecalllist.h +++ b/src/coreclr/src/vm/ecalllist.h @@ -164,9 +164,6 @@ FCFuncStart(gEnvironmentFuncs) QCFuncElement("GetProcessorCount", SystemNative::GetProcessorCount) FCFuncElement("GetCommandLineArgsNative", SystemNative::GetCommandLineArgs) -#if defined(FEATURE_COMINTEROP) - QCFuncElement("WinRTSupported", SystemNative::WinRTSupported) -#endif // FEATURE_COMINTEROP FCFuncElementSig("FailFast", &gsig_SM_Str_RetVoid, SystemNative::FailFast) FCFuncElementSig("FailFast", &gsig_SM_Str_Exception_RetVoid, SystemNative::FailFastWithException) FCFuncElementSig("FailFast", &gsig_SM_Str_Exception_Str_RetVoid, SystemNative::FailFastWithExceptionAndSource)