diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-01-24 21:43:42 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-24 21:43:42 -0800 |
commit | dbe16c169ad9c10a48acee89d424852458cb5ca0 (patch) | |
tree | 627c13f0b69349381f98ce58da95c464a2ae04b9 /src/zap | |
parent | 9489767df726d4bde4900c56734b19fecea087cd (diff) | |
download | coreclr-dbe16c169ad9c10a48acee89d424852458cb5ca0.tar.gz coreclr-dbe16c169ad9c10a48acee89d424852458cb5ca0.tar.bz2 coreclr-dbe16c169ad9c10a48acee89d424852458cb5ca0.zip |
Revert "Generate P/Invoke transitions for CoreRT."
Diffstat (limited to 'src/zap')
-rw-r--r-- | src/zap/zapinfo.cpp | 13 | ||||
-rw-r--r-- | src/zap/zapinfo.h | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp index 5258dfef24..e3c2759e82 100644 --- a/src/zap/zapinfo.cpp +++ b/src/zap/zapinfo.cpp @@ -2731,9 +2731,9 @@ void * ZapInfo::getPInvokeUnmanagedTarget(CORINFO_METHOD_HANDLE method, void **p return NULL; } -void ZapInfo::getAddressOfPInvokeFixup(CORINFO_METHOD_HANDLE method, CORINFO_CONST_LOOKUP *pLookup) +void * ZapInfo::getAddressOfPInvokeFixup(CORINFO_METHOD_HANDLE method,void **ppIndirection) { - _ASSERTE(pLookup != NULL); + _ASSERTE(ppIndirection != NULL); m_pImage->m_pPreloader->AddMethodToTransitiveClosureOfInstantiations(method); @@ -2741,9 +2741,8 @@ void ZapInfo::getAddressOfPInvokeFixup(CORINFO_METHOD_HANDLE method, CORINFO_CON if (moduleHandle == m_pImage->m_hModule && m_pImage->m_pPreloader->CanEmbedMethodHandle(method, m_currentMethodHandle)) { - pLookup->accessType = IAT_PVALUE; - pLookup->addr = PVOID(m_pImage->GetWrappers()->GetAddrOfPInvokeFixup(method)); - return; + *ppIndirection = NULL; + return PVOID(m_pImage->GetWrappers()->GetAddrOfPInvokeFixup(method)); } // @@ -2756,8 +2755,8 @@ void ZapInfo::getAddressOfPInvokeFixup(CORINFO_METHOD_HANDLE method, CORINFO_CON ZapImport * pImport = m_pImage->GetImportTable()->GetIndirectPInvokeTargetImport(method); AppendConditionalImport(pImport); - pLookup->accessType = IAT_PPVALUE; - pLookup->addr = pImport; + *ppIndirection = pImport; + return NULL; } CORINFO_JUST_MY_CODE_HANDLE ZapInfo::getJustMyCodeHandle( diff --git a/src/zap/zapinfo.h b/src/zap/zapinfo.h index e32d2068d5..1d16c9b760 100644 --- a/src/zap/zapinfo.h +++ b/src/zap/zapinfo.h @@ -430,8 +430,8 @@ public: void **ppIndirection); void * getPInvokeUnmanagedTarget(CORINFO_METHOD_HANDLE method, void **ppIndirection); - void getAddressOfPInvokeFixup(CORINFO_METHOD_HANDLE method, - CORINFO_CONST_LOOKUP *pLookup); + void * getAddressOfPInvokeFixup(CORINFO_METHOD_HANDLE method, + void **ppIndirection); CORINFO_JUST_MY_CODE_HANDLE getJustMyCodeHandle( CORINFO_METHOD_HANDLE method, CORINFO_JUST_MY_CODE_HANDLE **ppIndirection); |