diff options
author | John Chen (CLR) <jochen@microsoft.com> | 2015-04-29 13:13:30 -0700 |
---|---|---|
committer | John Chen (CLR) <jochen@microsoft.com> | 2015-04-29 14:45:36 -0700 |
commit | 6058c71910eed8afd1ff57e4c51c9ad4ce623973 (patch) | |
tree | 3dc18b20c1a1a9de48ef8773158b61df7808b0c1 /src/vm/comdelegate.cpp | |
parent | 9579c444040a9fa9780b299cd536cb8ca1b8eaff (diff) | |
download | coreclr-6058c71910eed8afd1ff57e4c51c9ad4ce623973.tar.gz coreclr-6058c71910eed8afd1ff57e4c51c9ad4ce623973.tar.bz2 coreclr-6058c71910eed8afd1ff57e4c51c9ad4ce623973.zip |
Fix warnings introduced by crossgen
Diffstat (limited to 'src/vm/comdelegate.cpp')
-rw-r--r-- | src/vm/comdelegate.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/vm/comdelegate.cpp b/src/vm/comdelegate.cpp index f461931f0e..193f6f4786 100644 --- a/src/vm/comdelegate.cpp +++ b/src/vm/comdelegate.cpp @@ -38,31 +38,6 @@ #ifndef DACCESS_COMPILE -static PCODE GetVirtualCallStub(MethodDesc *method, TypeHandle scopeType) -{ - CONTRACTL - { - THROWS; - GC_TRIGGERS; - MODE_ANY; - INJECT_FAULT(COMPlusThrowOM()); // from MetaSig::SizeOfArgStack - } - CONTRACTL_END; - - //TODO: depending on what we decide for generics method we may want to move this check to better places - if (method->IsGenericMethodDefinition() || method->HasMethodInstantiation()) - { - COMPlusThrow(kNotSupportedException); - } - - // need to grab a virtual dispatch stub - // method can be on a canonical MethodTable, we need to allocate the stub on the loader allocator associated with the exact type instantiation. - VirtualCallStubManager *pVirtualStubManager = scopeType.GetMethodTable()->GetLoaderAllocator()->GetVirtualCallStubManager(); - PCODE pTargetCall = pVirtualStubManager->GetCallStub(scopeType, method); - _ASSERTE(pTargetCall); - return pTargetCall; -} - #if defined(_TARGET_AMD64_) && !defined(UNIX_AMD64_ABI) // ShuffleOfs not needed @@ -498,6 +473,31 @@ Stub* COMDelegate::SetupShuffleThunk(MethodTable * pDelMT, MethodDesc *pTargetMe #ifndef CROSSGEN_COMPILE +static PCODE GetVirtualCallStub(MethodDesc *method, TypeHandle scopeType) +{ + CONTRACTL + { + THROWS; + GC_TRIGGERS; + MODE_ANY; + INJECT_FAULT(COMPlusThrowOM()); // from MetaSig::SizeOfArgStack + } + CONTRACTL_END; + + //TODO: depending on what we decide for generics method we may want to move this check to better places + if (method->IsGenericMethodDefinition() || method->HasMethodInstantiation()) + { + COMPlusThrow(kNotSupportedException); + } + + // need to grab a virtual dispatch stub + // method can be on a canonical MethodTable, we need to allocate the stub on the loader allocator associated with the exact type instantiation. + VirtualCallStubManager *pVirtualStubManager = scopeType.GetMethodTable()->GetLoaderAllocator()->GetVirtualCallStubManager(); + PCODE pTargetCall = pVirtualStubManager->GetCallStub(scopeType, method); + _ASSERTE(pTargetCall); + return pTargetCall; +} + FCIMPL5(FC_BOOL_RET, COMDelegate::BindToMethodName, Object *refThisUNSAFE, Object *targetUNSAFE, |