diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2015-03-17 11:54:26 -0700 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2015-03-17 11:54:26 -0700 |
| commit | fd60de4934239cd772c7dfa316a9befd3da18f04 (patch) | |
| tree | b76f6d3f7d340a852adafe24bc62af0f1ed7d0dd /src/inc/jithelpers.h | |
| parent | 0805738bc10470dc60b65180308e02d305e0be84 (diff) | |
| download | coreclr-fd60de4934239cd772c7dfa316a9befd3da18f04.tar.gz coreclr-fd60de4934239cd772c7dfa316a9befd3da18f04.tar.bz2 coreclr-fd60de4934239cd772c7dfa316a9befd3da18f04.zip | |
Merge changes from parent branch
[tfs-changeset: 1434167]
Diffstat (limited to 'src/inc/jithelpers.h')
| -rw-r--r-- | src/inc/jithelpers.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/inc/jithelpers.h b/src/inc/jithelpers.h index 6542582a17..ae4080ba77 100644 --- a/src/inc/jithelpers.h +++ b/src/inc/jithelpers.h @@ -132,6 +132,9 @@ JITHELPER1(CORINFO_HELP_RNGCHKFAIL, JIT_RngChkFail, CORINFO_HELP_SIG_REG_ONLY, MDIL_HELP_RNGCHKFAIL) JITHELPER1(CORINFO_HELP_OVERFLOW, JIT_Overflow, CORINFO_HELP_SIG_REG_ONLY, MDIL_HELP_OVERFLOW) JITHELPER1(CORINFO_HELP_THROWDIVZERO, JIT_ThrowDivZero, CORINFO_HELP_SIG_REG_ONLY, MDIL_HELP_UNDEF) +#ifndef RYUJIT_CTPBUILD + JITHELPER1(CORINFO_HELP_THROWNULLREF, JIT_ThrowNullRef, CORINFO_HELP_SIG_REG_ONLY, MDIL_HELP_UNDEF) +#endif JITHELPER1(CORINFO_HELP_INTERNALTHROW, JIT_InternalThrow, CORINFO_HELP_SIG_REG_ONLY, MDIL_HELP_INTERNALTHROW) JITHELPER1(CORINFO_HELP_VERIFICATION, IL_VerificationError,CORINFO_HELP_SIG_REG_ONLY, MDIL_HELP_VERIFICATION) JITHELPER1(CORINFO_HELP_SEC_UNMGDCODE_EXCPT, JIT_SecurityUnmanagedCodeException, CORINFO_HELP_SIG_REG_ONLY, MDIL_HELP_SEC_UNMGDCODE_EXCPT) @@ -325,6 +328,7 @@ JITHELPER1(CORINFO_HELP_READYTORUN_CHKCAST, NULL, CORINFO_HELP_SIG_NO_ALIGN_STUB, MDIL_HELP_UNDEF) JITHELPER1(CORINFO_HELP_READYTORUN_STATIC_BASE, NULL, CORINFO_HELP_SIG_NO_ALIGN_STUB, MDIL_HELP_UNDEF) JITHELPER1(CORINFO_HELP_READYTORUN_VIRTUAL_FUNC_PTR, NULL, CORINFO_HELP_SIG_NO_ALIGN_STUB, MDIL_HELP_UNDEF) + JITHELPER1(CORINFO_HELP_READYTORUN_DELEGATE_CTOR, NULL, CORINFO_HELP_SIG_NO_ALIGN_STUB, MDIL_HELP_UNDEF) #endif JITHELPER1(CORINFO_HELP_EE_PRESTUB, ThePreStub, CORINFO_HELP_SIG_NO_ALIGN_STUB, MDIL_HELP_EE_PRESTUB) |