projects
/
platform
/
upstream
/
coreclr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80fdb42
)
Use correct basic block to check legality of PInvoke callsite for inlining (#18620)
author
Jan Kotas
<jkotas@microsoft.com>
Sun, 24 Jun 2018 03:20:58 +0000
(20:20 -0700)
committer
GitHub
<noreply@github.com>
Sun, 24 Jun 2018 03:20:58 +0000
(20:20 -0700)
It is the same logic as used in other similar places
src/jit/importer.cpp
patch
|
blob
|
history
diff --git
a/src/jit/importer.cpp
b/src/jit/importer.cpp
index
b236c97
..
fe30580
100644
(file)
--- a/
src/jit/importer.cpp
+++ b/
src/jit/importer.cpp
@@
-19061,7
+19061,9
@@
void Compiler::impMarkInlineCandidate(GenTree* callNode,
if (methAttr & CORINFO_FLG_PINVOKE)
{
- if (!impCanPInvokeInlineCallSite(compCurBB))
+ // See comment in impCheckForPInvokeCall
+ BasicBlock* block = compIsForInlining() ? impInlineInfo->iciBlock : compCurBB;
+ if (!impCanPInvokeInlineCallSite(block))
{
inlineResult.NoteFatal(InlineObservation::CALLSITE_PINVOKE_EH);
return;