diff options
| author | Pat Gavlin <pagavlin@microsoft.com> | 2016-05-12 12:57:13 -0700 |
|---|---|---|
| committer | Pat Gavlin <pagavlin@microsoft.com> | 2016-05-12 12:57:13 -0700 |
| commit | 8a972e65990b962613b474c11639245d90be5079 (patch) | |
| tree | eefc17d371ea17abd3941e771bcda558df326cf3 /src/zap | |
| parent | 7100aeb91649f7f1f8cd552419a38d51c7402927 (diff) | |
| download | coreclr-8a972e65990b962613b474c11639245d90be5079.tar.gz coreclr-8a972e65990b962613b474c11639245d90be5079.tar.bz2 coreclr-8a972e65990b962613b474c11639245d90be5079.zip | |
Apply the JIT interface changes needed for Fadi's upcoming shared generics change.
[tfs-changeset: 1604316]
Diffstat (limited to 'src/zap')
| -rw-r--r-- | src/zap/zapinfo.cpp | 7 | ||||
| -rw-r--r-- | src/zap/zapinfo.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp index 8b6e216de4..79abbf7bc1 100644 --- a/src/zap/zapinfo.cpp +++ b/src/zap/zapinfo.cpp @@ -1582,7 +1582,6 @@ ZapInfo::getLocationOfThisType(CORINFO_METHOD_HANDLE context) return m_pEEJitInfo->getLocationOfThisType(context); } - void ZapInfo::embedGenericHandle(CORINFO_RESOLVED_TOKEN * pResolvedToken, BOOL fEmbedParent, @@ -3394,8 +3393,9 @@ CorInfoHelpFunc ZapInfo::getNewArrHelper(CORINFO_CLASS_HANDLE arrayCls) return m_pEEJitInfo->getNewArrHelper(arrayCls); } -void ZapInfo::getReadyToRunHelper( +bool ZapInfo::getReadyToRunHelper( CORINFO_RESOLVED_TOKEN * pResolvedToken, + CORINFO_LOOKUP_KIND * pGenericLookupKind, CorInfoHelpFunc id, CORINFO_CONST_LOOKUP * pLookup ) @@ -3481,6 +3481,9 @@ void ZapInfo::getReadyToRunHelper( pLookup->accessType = IAT_PVALUE; pLookup->addr = pImport; + return true; +#else + return false; #endif } diff --git a/src/zap/zapinfo.h b/src/zap/zapinfo.h index b472d4870b..059917acfb 100644 --- a/src/zap/zapinfo.h +++ b/src/zap/zapinfo.h @@ -546,8 +546,9 @@ public: CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_HANDLE cls); CorInfoHelpFunc getUnBoxHelper(CORINFO_CLASS_HANDLE cls); - void getReadyToRunHelper( + bool getReadyToRunHelper( CORINFO_RESOLVED_TOKEN * pResolvedToken, + CORINFO_LOOKUP_KIND * pGenericLookupKind, CorInfoHelpFunc id, CORINFO_CONST_LOOKUP * pLookup ); |