diff options
| author | Andy Ayers <andya@microsoft.com> | 2017-04-24 16:42:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 16:42:38 -0700 |
| commit | 3712f59c73f00d3312e62f9440c7f03fc7d458e7 (patch) | |
| tree | a7deebcb03da6119a81dea82bb064acc9be4b50f | |
| parent | 80cd4598074372d13cef0afcf1375093e36ac0ff (diff) | |
| parent | f0acfab2c5ecf7896b4f83bd8988fde0779dd849 (diff) | |
| download | coreclr-3712f59c73f00d3312e62f9440c7f03fc7d458e7.tar.gz coreclr-3712f59c73f00d3312e62f9440c7f03fc7d458e7.tar.bz2 coreclr-3712f59c73f00d3312e62f9440c7f03fc7d458e7.zip | |
Merge pull request #11152 from AndyAyersMS/FixTailCallStressAssert
JIT: simple fix for the tail call stress assert
| -rw-r--r-- | src/jit/importer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp index 432cfc9282..9d27277d86 100644 --- a/src/jit/importer.cpp +++ b/src/jit/importer.cpp @@ -6216,6 +6216,12 @@ bool Compiler::impTailCallRetTypeCompatible(var_types callerRetType, return true; } + // If the class handles are the same and not null, the return types are compatible. + if ((callerRetTypeClass != nullptr) && (callerRetTypeClass == calleeRetTypeClass)) + { + return true; + } + #if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_) // Jit64 compat: if (callerRetType == TYP_VOID) |