[MERGE chakra-core#4430 @MikeHolman] make inliner SAL annotation more precise

MikeHolman · MikeHolman · commit 2e85771b78ae · 2017-12-15T16:20:49.000-08:00
Merge pull request chakra-core#4430 from MikeHolman:oacrfailnull Avoids need for AnalysisAssert statement in callers
diff --git a/lib/Backend/Inline.cpp b/lib/Backend/Inline.cpp
@@ -2575,7 +2575,6 @@ IR::Instr * Inline::InlineApplyBuiltInTargetWithArray(IR::Instr * callInstr, con
     {
         return callInstr;
     }
-    AnalysisAssert(applyTargetLdInstr != nullptr);
     // Fixed function/function object checks for target built-in
     callInstr->ReplaceSrc1(applyTargetLdInstr->GetDst());
     EmitFixedMethodOrFunctionObjectChecksForBuiltIns(callInstr, callInstr, builtInInfo, false /*isPolymorphic*/, true /*isBuiltIn*/, false /*isCtor*/, true /*isInlined*/);
@@ -2718,7 +2717,8 @@ void Inline::GetArgInstrsForCallAndApply(IR::Instr* callInstr, IR::Instr** impli
     linkOpnd->AsRegOpnd()->m_sym->m_isInlinedArgSlot = true;
 }
 
-bool Inline::TryGetApplyAndTargetLdInstrs(IR::Instr * callInstr, _Outptr_result_maybenull_ IR::Instr ** applyLdInstr, _Outptr_result_maybenull_ IR::Instr ** applyTargetLdInstr)
+_Success_(return != false)
+bool Inline::TryGetApplyAndTargetLdInstrs(IR::Instr * callInstr, _Outptr_result_nullonfailure_ IR::Instr ** applyLdInstr, _Outptr_result_nullonfailure_ IR::Instr ** applyTargetLdInstr)
 {
     IR::Opnd* applyOpnd = callInstr->GetSrc1();
     Assert(applyOpnd->IsRegOpnd());
@@ -2761,7 +2761,6 @@ bool Inline::InlineApplyScriptTarget(IR::Instr *callInstr, const FunctionJITTime
     {
         return false;
     }
-    AnalysisAssert(applyTargetLdInstr != nullptr);
     
     if(applyTargetLdInstr->m_opcode != Js::OpCode::LdFldForCallApplyTarget ||
         ((applyTargetLdInstr->AsProfiledInstr()->u.FldInfo().flags & Js::FldInfo_FromAccessor) != 0))
diff --git a/lib/Backend/Inline.h b/lib/Backend/Inline.h
@@ -53,7 +53,7 @@ class Inline
     bool        InlineApplyScriptTarget(IR::Instr *callInstr, const FunctionJITTimeInfo* inlinerData, const FunctionJITTimeInfo** pInlineeData, const FunctionJITTimeInfo * applyFuncInfo,
                                     const StackSym *symThis, IR::Instr ** returnInstr, uint recursiveInlineDepth, bool isArrayOpndArgumentsObject, uint argsCount);
     void        GetArgInstrsForCallAndApply(IR::Instr* callInstr, IR::Instr** implicitThisArgOut, IR::Instr** explicitThisArgOut, IR::Instr** argumentsOrArrayArgOut, uint &argOutCount);
-    bool        TryGetApplyAndTargetLdInstrs(IR::Instr * callInstr, _Outptr_result_maybenull_ IR::Instr ** applyLdInstr, _Outptr_result_maybenull_ IR::Instr ** applyTargetLdInstr);
+    _Success_(return != false) bool        TryGetApplyAndTargetLdInstrs(IR::Instr * callInstr, _Outptr_result_nullonfailure_ IR::Instr ** applyLdInstr, _Outptr_result_nullonfailure_ IR::Instr ** applyTargetLdInstr);
     IR::Instr * InlineCall(IR::Instr *callInstr, const FunctionJITTimeInfo * inlineeData, const FunctionJITTimeInfo * inlinerData, const StackSym *symThis, bool* pIsInlined, uint callSiteId, uint recursiveInlineDepth);
     bool        InlineCallTarget(IR::Instr *callInstr, const FunctionJITTimeInfo* inlinerData, const FunctionJITTimeInfo** pInlineeData, const FunctionJITTimeInfo *callFuncInfo,
                                     const StackSym *symThis, IR::Instr ** returnInstr, uint recursiveInlineDepth);

Original file line number	Diff line number	Diff line change
`@@ -2575,7 +2575,6 @@ IR::Instr * Inline::InlineApplyBuiltInTargetWithArray(IR::Instr * callInstr, con`
`2575`	`2575`	`{`
`2576`	`2576`	`return callInstr;`
`2577`	`2577`	`}`
`2578`		`- AnalysisAssert(applyTargetLdInstr != nullptr);`
`2579`	`2578`	`// Fixed function/function object checks for target built-in`
`2580`	`2579`	`callInstr->ReplaceSrc1(applyTargetLdInstr->GetDst());`
`2581`	`2580`	`EmitFixedMethodOrFunctionObjectChecksForBuiltIns(callInstr, callInstr, builtInInfo, false /isPolymorphic/, true /isBuiltIn/, false /isCtor/, true /isInlined/);`
`@@ -2718,7 +2717,8 @@ void Inline::GetArgInstrsForCallAndApply(IR::Instr* callInstr, IR::Instr** impli`
`2718`	`2717`	`linkOpnd->AsRegOpnd()->m_sym->m_isInlinedArgSlot = true;`
`2719`	`2718`	`}`
`2720`	`2719`
`2721`		`-bool Inline::TryGetApplyAndTargetLdInstrs(IR::Instr * callInstr, _Outptr_result_maybenull_ IR::Instr applyLdInstr, _Outptr_result_maybenull_ IR::Instr applyTargetLdInstr)`
	`2720`	`+_Success_(return != false)`
	`2721`	`+bool Inline::TryGetApplyAndTargetLdInstrs(IR::Instr * callInstr, _Outptr_result_nullonfailure_ IR::Instr applyLdInstr, _Outptr_result_nullonfailure_ IR::Instr applyTargetLdInstr)`
`2722`	`2722`	`{`
`2723`	`2723`	`IR::Opnd* applyOpnd = callInstr->GetSrc1();`
`2724`	`2724`	`Assert(applyOpnd->IsRegOpnd());`
`@@ -2761,7 +2761,6 @@ bool Inline::InlineApplyScriptTarget(IR::Instr *callInstr, const FunctionJITTime`
`2761`	`2761`	`{`
`2762`	`2762`	`return false;`
`2763`	`2763`	`}`
`2764`		`- AnalysisAssert(applyTargetLdInstr != nullptr);`
`2765`	`2764`
`2766`	`2765`	`if(applyTargetLdInstr->m_opcode != Js::OpCode::LdFldForCallApplyTarget \|\|`
`2767`	`2766`	`((applyTargetLdInstr->AsProfiledInstr()->u.FldInfo().flags & Js::FldInfo_FromAccessor) != 0))`