diff options
| author | Yi Zhang (CLR) <yizhang82@users.noreply.github.com> | 2017-05-22 17:52:59 -0700 |
|---|---|---|
| committer | Yi Zhang (CLR) <yzha@microsoft.com> | 2017-07-19 11:16:56 -0700 |
| commit | a5f9bde9086a0a69ae290cf40bb89403d640e85f (patch) | |
| tree | 09665551068c65b1dc2660322da8b7bef0ea923c /src/vm/methodtable.inl | |
| parent | 9b8471b34c8fad1694ea0e9562e4699ac4eeda6e (diff) | |
| download | coreclr-a5f9bde9086a0a69ae290cf40bb89403d640e85f.tar.gz coreclr-a5f9bde9086a0a69ae290cf40bb89403d640e85f.tar.bz2 coreclr-a5f9bde9086a0a69ae290cf40bb89403d640e85f.zip | |
More update in /dev/defaultintf (#11693)
* Support non-virtual calls on interface private members correctly
* Support protected methods
* Properly handle precode
* Throw (tentative) exception when seeing conflict overrides and add a test case
(This updates CoreCLR dev/defaultintf the same with the build we are showing at //build)
Diffstat (limited to 'src/vm/methodtable.inl')
| -rw-r--r-- | src/vm/methodtable.inl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/vm/methodtable.inl b/src/vm/methodtable.inl index f8a073f5bb..a8a4d2301c 100644 --- a/src/vm/methodtable.inl +++ b/src/vm/methodtable.inl @@ -654,11 +654,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot(DWORD slot) // for an interface virtual, since their slots usually point to stub. if (IsInterface() && slot < GetNumVirtuals()) { - // @DIM_TODO - This is not a reliable approach. Need to change MakeJitWorker to not stomp - // over slot and instead set the target of precode to the address. We may need the precode - // there anyway to handle other cases too (such as interop). - MethodDesc *pMD = MethodDesc::GetMethodDescFromStubAddr(pCode, /* fSpeculative = */ TRUE); - if (pMD != NULL) return pMD; + return MethodDesc::GetMethodDescFromStubAddr(pCode); } return MethodTable::GetMethodDescForSlotAddress(pCode); |