Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/coreclr/interpreter/compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3668,6 +3668,13 @@ bool InterpCompiler::EmitNamedIntrinsicCall(NamedIntrinsic ni, bool nonVirtualCa
// These intrinsics are handled in the il peeps path, and do not need to produce warnings here.
return false;

case NI_System_StubHelpers_NextCallReturnAddress:
// This intrinsic can only reach here if it is not followed by a POP, and in that case it is not supported by the interpreter.
// So we must skip compiling it. It should only appear in the case of tail-call stubs, and those are currently only supported by the JIT, so
// we presumably have a JIT available to implement this intrinsic.
SKIPCODE("NextCallReturnAddress intrinsic not supported in interpreter when not followed by POP");
return false;

default:
{
FAIL_TO_EXPAND_INTRINSIC:
Expand Down
7 changes: 7 additions & 0 deletions src/coreclr/interpreter/eeinterp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,13 @@ INTERPRETER_NORETURN void BADCODE(const char* message)
throw InterpException(message, CORJIT_BADCODE);
}

INTERPRETER_NORETURN void SKIPCODE(const char* message)
{
if (IsInterpDumpActive())
printf("Skip during interpreter method compilation: %s\n", message ? message : "unknown error");
throw InterpException(message, CORJIT_SKIPPED);
}

INTERPRETER_NORETURN void NOMEM()
{
throw InterpException(NULL, CORJIT_OUTOFMEM);
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/interpreter/failures.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
INTERPRETER_NORETURN void NO_WAY(const char* message);
INTERPRETER_NORETURN void BADCODE(const char* message);
INTERPRETER_NORETURN void NOMEM();
INTERPRETER_NORETURN void SKIPCODE(const char* message);

#endif
Loading