Merge pull request #3229 from AndyAyersMS/InlineRefactor4a

Inline refactoring: add candidate observations

diff --cc src/jit/flowgraph.cpp
Simple merge

diff --cc src/jit/importer.cpp
index f5b1fd3,80ab006..3ea0d95
--- 1/src/jit/importer.cpp
--- 2/src/jit/importer.cpp
+++ b/src/jit/importer.cpp
@@@ -15872,8 -15878,50 +15874,8 @@@ void Compiler::impCanInlineIL(CORINFO_M
          return;
      }
  
 -#ifdef FEATURE_LEGACYNETCF
 -
 -    // Check for NetCF quirks mode and the NetCF restrictions
 -    if (opts.eeFlags & CORJIT_FLG_NETCF_QUIRKS)
 -    {
 -       if (codeSize > 16)
 -       {
 -          compInlineResult->noteFatal(InlineObservation::CALLEE_WP7QUIRK_IL_TOO_BIG);
 -          return;
 -       }
 -
 -       if (methInfo->EHcount)
 -       {
 -          compInlineResult->noteFatal(InlineObservation::CALLEE_WP7QUIRK_HAS_EH);
 -          return;
 -       }
 -
 -       if (methInfo->locals.numArgs > 0)
 -       {
 -          compInlineResult->noteFatal(InlineObservation::CALLEE_WP7QUIRK_HAS_LOCALS);
 -          return;
 -       }
 -
 -       if (methInfo->args.retType == CORINFO_TYPE_FLOAT)
 -       {
 -          compInlineResult->noteFatal(InlineObservation::CALLEE_WP7QUIRK_HAS_FP_RET);
 -          return;
 -       }
 -
 -       CORINFO_ARG_LIST_HANDLE argLst = methInfo->args.args;
 -       for(unsigned i = methInfo->args.numArgs; i > 0; --i, argLst = info.compCompHnd->getArgNext(argLst))
 -       {
 -           if (TYP_FLOAT == eeGetArgType(argLst, &methInfo->args))
 -           {
 -               compInlineResult->noteFatal(InlineObservation::CALLEE_WP7QUIRK_HAS_FP_ARG);
 -               return;
 -           }
 -       }
 -    }
 -
 -#endif // FEATURE_LEGACYNETCF
 -
      // Still a viable candidate...
-     inlineResult->setCandidate("impCanInlineIL");
+     inlineResult->noteCandidate(InlineObservation::CALLEE_CAN_INLINE_IL);
  }
  
  /*****************************************************************************

diff --cc src/jit/inline.def
Simple merge