Allow CALLEE_IS_FORCE_INLINE precedent over CALLEE_DOES_NOT_RETURN (#14586)

benaadams · AndyAyersMS · commit c459b52c0f30 · 2018-01-11T01:10:35.000-08:00
Allow CALLEE_IS_FORCE_INLINE precedent over CALLEE_DOES_NOT_RETURN
diff --git 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);
             }

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,8 @@ void DefaultPolicy::NoteInt(InlineObservation obs, int value)`
`484`	`484`
`485`	`485`	`unsigned basicBlockCount = static_cast<unsigned>(value);`
`486`	`486`
`487`		`- if (m_IsNoReturn && (basicBlockCount == 1))`
	`487`	`+ // CALLEE_IS_FORCE_INLINE overrides CALLEE_DOES_NOT_RETURN`
	`488`	`+ if (!m_IsForceInline && m_IsNoReturn && (basicBlockCount == 1))`
`488`	`489`	`{`
`489`	`490`	`SetNever(InlineObservation::CALLEE_DOES_NOT_RETURN);`
`490`	`491`	`}`