diff options
| author | Ben Adams <thundercat@illyriad.co.uk> | 2018-01-11 09:10:35 +0000 |
|---|---|---|
| committer | Andy Ayers <andya@microsoft.com> | 2018-01-11 01:10:35 -0800 |
| commit | c459b52c0f300860bb877b46165018a882e8ee99 (patch) | |
| tree | dfaa26fb6079c0c4194affa17a6c5cded1cdc6b6 /src/jit/inlinepolicy.cpp | |
| parent | d97e8854e0d2e7bbc8c549a68d9592c1dbc5ac4e (diff) | |
| download | coreclr-c459b52c0f300860bb877b46165018a882e8ee99.tar.gz coreclr-c459b52c0f300860bb877b46165018a882e8ee99.tar.bz2 coreclr-c459b52c0f300860bb877b46165018a882e8ee99.zip | |
Allow CALLEE_IS_FORCE_INLINE precedent over CALLEE_DOES_NOT_RETURN (#14586)
Allow CALLEE_IS_FORCE_INLINE precedent over CALLEE_DOES_NOT_RETURN
Diffstat (limited to 'src/jit/inlinepolicy.cpp')
| -rw-r--r-- | src/jit/inlinepolicy.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jit/inlinepolicy.cpp b/src/jit/inlinepolicy.cpp index 959ef1ba68..306a04d7a6 100644 --- a/src/jit/inlinepolicy.cpp +++ b/src/jit/inlinepolicy.cpp @@ -484,7 +484,8 @@ void DefaultPolicy::NoteInt(InlineObservation obs, int value) unsigned basicBlockCount = static_cast<unsigned>(value); - if (m_IsNoReturn && (basicBlockCount == 1)) + // CALLEE_IS_FORCE_INLINE overrides CALLEE_DOES_NOT_RETURN + if (!m_IsForceInline && m_IsNoReturn && (basicBlockCount == 1)) { SetNever(InlineObservation::CALLEE_DOES_NOT_RETURN); } |