From eeef1c1379b9f49261f66093b355ac8c12e47485 Mon Sep 17 00:00:00 2001 From: Austin Wise Date: Sun, 7 Oct 2018 18:58:10 -0700 Subject: Remove some dead remoting and context static things (#20277) * Remove IsRemotingIntercepted methods that always return false. * Remove GetOptionalMembersAllocationSize parameters that are always false. * Remove references to context static. Remove references in comments and methodnames. * Remove RemotingVtsInfo. --- src/vm/method.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/vm/method.cpp') diff --git a/src/vm/method.cpp b/src/vm/method.cpp index 2890c34fb7..a2440ff92a 100644 --- a/src/vm/method.cpp +++ b/src/vm/method.cpp @@ -2157,8 +2157,7 @@ PCODE MethodDesc::TryGetMultiCallableAddrOfCode(CORINFO_ACCESS_FLAGS accessFlags if (IsFCall()) { // Call FCalls directly when possible - if (((accessFlags & CORINFO_ACCESS_THIS) || !IsRemotingInterceptedViaPrestub()) - && !IsInterface() && !GetMethodTable()->ContainsGenericVariables()) + if (!IsInterface() && !GetMethodTable()->ContainsGenericVariables()) { BOOL fSharedOrDynamicFCallImpl; PCODE pFCallImpl = ECall::GetFCallImpl(this, &fSharedOrDynamicFCallImpl); @@ -2804,13 +2803,6 @@ bool MethodDesc::CanSkipDoPrestub ( // @todo generics: Until we fix the RVA map in zapper.cpp to be instantiation-aware, this must remain CheckRestore(); - // The remoting interception is not necessary if we are calling on the same thisptr - if (!(accessFlags & CORINFO_ACCESS_THIS) && IsRemotingInterceptedViaPrestub()) - { - *pReason = CORINFO_INDIRECT_CALL_REMOTING; - return false; - } - // The wrapper stubs cannot be called directly (like any other stubs) if (IsWrapperStub()) { @@ -5488,7 +5480,7 @@ PrecodeType MethodDesc::GetPrecodeType() PrecodeType precodeType = PRECODE_INVALID; #ifdef HAS_REMOTING_PRECODE - if (IsRemotingInterceptedViaPrestub() || (IsComPlusCall() && !IsStatic())) + if (IsComPlusCall() && !IsStatic()) { precodeType = PRECODE_REMOTING; } -- cgit v1.2.3