diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-02-10 10:59:33 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-02-10 14:07:24 -0800 |
| commit | ab98635befe574626e9ebb65e33fec3a060b4db6 (patch) | |
| tree | 5e352ec178cd0d7e30e39b1866fa74090edfd6e9 | |
| parent | 26b90b2a1331af2a0e918862505b52d573742061 (diff) | |
| download | coreclr-ab98635befe574626e9ebb65e33fec3a060b4db6.tar.gz coreclr-ab98635befe574626e9ebb65e33fec3a060b4db6.tar.bz2 coreclr-ab98635befe574626e9ebb65e33fec3a060b4db6.zip | |
Revert "JIT: fix confusing inline failure reason"
This reverts commit 0826f9dee6a8fdf8266523945708a684376b0280.
| -rw-r--r-- | src/jit/importer.cpp | 2 | ||||
| -rw-r--r-- | src/jit/inline.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp index 23bf90513b..7a489332f5 100644 --- a/src/jit/importer.cpp +++ b/src/jit/importer.cpp @@ -6519,7 +6519,7 @@ var_types Compiler::impImportCall(OPCODE opcode, if (mflags & CORINFO_FLG_DONT_INLINE_CALLER) { - compInlineResult->NoteFatal(InlineObservation::CALLEE_HAS_NOINLINE_CALLEE); + compInlineResult->NoteFatal(InlineObservation::CALLEE_STACK_CRAWL_MARK); return callRetTyp; } diff --git a/src/jit/inline.def b/src/jit/inline.def index 2a6f5a3f73..ff0b21100e 100644 --- a/src/jit/inline.def +++ b/src/jit/inline.def @@ -39,7 +39,6 @@ INLINE_OBSERVATION(HAS_LEAVE, bool, "has leave", INLINE_OBSERVATION(HAS_MANAGED_VARARGS, bool, "managed varargs", FATAL, CALLEE) INLINE_OBSERVATION(HAS_NATIVE_VARARGS, bool, "native varargs", FATAL, CALLEE) INLINE_OBSERVATION(HAS_NO_BODY, bool, "has no body", FATAL, CALLEE) -INLINE_OBSERVATION(HAS_NOINLINE_CALLEE, bool, "in corelib, noinline callee", FATAL, CALLEE) INLINE_OBSERVATION(HAS_NULL_FOR_LDELEM, bool, "has null pointer for ldelem", FATAL, CALLEE) INLINE_OBSERVATION(IS_ARRAY_METHOD, bool, "is array method", FATAL, CALLEE) INLINE_OBSERVATION(IS_GENERIC_VIRTUAL, bool, "generic virtual", FATAL, CALLEE) @@ -56,6 +55,7 @@ INLINE_OBSERVATION(NEEDS_SECURITY_CHECK, bool, "needs security check", INLINE_OBSERVATION(NO_METHOD_INFO, bool, "cannot get method info", FATAL, CALLEE) INLINE_OBSERVATION(NOT_PROFITABLE_INLINE, bool, "unprofitable inline", FATAL, CALLEE) INLINE_OBSERVATION(RANDOM_REJECT, bool, "random reject", FATAL, CALLEE) +INLINE_OBSERVATION(STACK_CRAWL_MARK, bool, "uses stack crawl mark", FATAL, CALLEE) INLINE_OBSERVATION(STFLD_NEEDS_HELPER, bool, "stfld needs helper", FATAL, CALLEE) INLINE_OBSERVATION(THROW_WITH_INVALID_STACK, bool, "throw with invalid stack", FATAL, CALLEE) INLINE_OBSERVATION(TOO_MANY_ARGUMENTS, bool, "too many arguments", FATAL, CALLEE) |