diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-09-24 11:08:51 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-09-24 11:08:51 -0700 |
| commit | f4560c6e113741d2296f2ebbc4cd6e6427b57a88 (patch) | |
| tree | 3370d390b9c24ebf71f1c6b8b7d2be6542df6a83 | |
| parent | 6d844126b0afb4b9d059a58fdd1c93a246555af3 (diff) | |
| parent | f87429893fa7d4ea24c4631cc1c229a05b3be9cc (diff) | |
| download | coreclr-f4560c6e113741d2296f2ebbc4cd6e6427b57a88.tar.gz coreclr-f4560c6e113741d2296f2ebbc4cd6e6427b57a88.tar.bz2 coreclr-f4560c6e113741d2296f2ebbc4cd6e6427b57a88.zip | |
Merge pull request #1612 from jkotas/readytorun-directcall
Handle direct call ReadyToRun helpers
| -rw-r--r-- | src/jit/codegenxarch.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/jit/codegenxarch.cpp b/src/jit/codegenxarch.cpp index 1f590abe02..076ba7c262 100644 --- a/src/jit/codegenxarch.cpp +++ b/src/jit/codegenxarch.cpp @@ -5094,13 +5094,16 @@ void CodeGen::genCallInstruction(GenTreePtr node) genConsumeReg(target)); } } -#if defined(_TARGET_AMD64_) && defined(FEATURE_READYTORUN_COMPILER) +#ifdef FEATURE_READYTORUN_COMPILER else if (call->gtEntryPoint.addr != nullptr) { - genEmitCall(emitter::EC_FUNC_TOKEN_INDIR, + genEmitCall((call->gtEntryPoint.accessType == IAT_VALUE) ? emitter::EC_FUNC_TOKEN : emitter::EC_FUNC_TOKEN_INDIR, methHnd, INDEBUG_LDISASM_COMMA(sigInfo) (void*) call->gtEntryPoint.addr, +#ifdef _TARGET_X86_ + stackArgBytes, +#endif // _TARGET_X86_ retSize, ilOffset); } |