summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAditya Mandaleeka <adityam@microsoft.com>2019-02-04 15:12:33 -0800
committerAditya Mandaleeka <adityam@microsoft.com>2019-02-04 15:15:48 -0800
commit95c84623ce5d4338a4706dd989cbb5de3b51a12f (patch)
tree285e0218b31a78289ef25dd947648701dbcb062d /src
parent23dfb8f822c24c7cef9ae40e9e4e70574abb1ea6 (diff)
downloadcoreclr-95c84623ce5d4338a4706dd989cbb5de3b51a12f.tar.gz
coreclr-95c84623ce5d4338a4706dd989cbb5de3b51a12f.tar.bz2
coreclr-95c84623ce5d4338a4706dd989cbb5de3b51a12f.zip
Disable PInvoke inlining within try regions on ARM64.
Diffstat (limited to 'src')
-rw-r--r--src/jit/importer.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp
index 163779c72a..477b12448d 100644
--- a/src/jit/importer.cpp
+++ b/src/jit/importer.cpp
@@ -6696,10 +6696,12 @@ bool Compiler::impCanPInvokeInlineCallSite(BasicBlock* block)
return true;
}
-#ifdef _TARGET_AMD64_
- // On x64, we disable pinvoke inlining inside of try regions.
- // Here is the comment from JIT64 explaining why:
+#ifdef _TARGET_64BIT_
+ // On 64-bit platforms, we disable pinvoke inlining inside of try regions.
+ // Note that this could be needed on other architectures too, but we
+ // haven't done enough investigation to know for sure at this point.
//
+ // Here is the comment from JIT64 explaining why:
// [VSWhidbey: 611015] - because the jitted code links in the
// Frame (instead of the stub) we rely on the Frame not being
// 'active' until inside the stub. This normally happens by the
@@ -6721,7 +6723,7 @@ bool Compiler::impCanPInvokeInlineCallSite(BasicBlock* block)
{
return false;
}
-#endif // _TARGET_AMD64_
+#endif // _TARGET_64BIT_
return true;
}