diff options
| author | noahfalk <noahfalk@users.noreply.github.com> | 2017-02-13 17:51:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 17:51:40 -0800 |
| commit | 3cd73fb25a2608b4ef74bbbb8969a5d7ad9da213 (patch) | |
| tree | 7ddcbc0ab421d192d00b4fc50f00fd505be11bc4 /src/zap/zapinfo.cpp | |
| parent | 4f059553beab82aca5dff28227730ba976afeb99 (diff) | |
| parent | ac40eab10f2f65a0fe9c88b762da1719d5c3839c (diff) | |
| download | coreclr-3cd73fb25a2608b4ef74bbbb8969a5d7ad9da213.tar.gz coreclr-3cd73fb25a2608b4ef74bbbb8969a5d7ad9da213.tar.bz2 coreclr-3cd73fb25a2608b4ef74bbbb8969a5d7ad9da213.zip | |
Merge pull request #9298 from noahfalk/r2r
Rejit support for R2R
Diffstat (limited to 'src/zap/zapinfo.cpp')
| -rw-r--r-- | src/zap/zapinfo.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp index 4b2f39a264..2095524609 100644 --- a/src/zap/zapinfo.cpp +++ b/src/zap/zapinfo.cpp @@ -3622,8 +3622,13 @@ void ZapInfo::reportInliningDecision (CORINFO_METHOD_HANDLE inlinerHnd, CorInfoInline inlineResult, const char * reason) { - - + if (!dontInline(inlineResult) && inlineeHnd != NULL) + { + // We deliberately report m_currentMethodHandle (not inlinerHnd) as inliner, because + // if m_currentMethodHandle != inlinerHnd, it simply means that inlinerHnd is intermediate link + // in inlining into m_currentMethodHandle, and we have no interest to track those intermediate links now. + m_pImage->m_pPreloader->ReportInlining(m_currentMethodHandle, inlineeHnd); + } return m_pEEJitInfo->reportInliningDecision(inlinerHnd, inlineeHnd, inlineResult, reason); } |