Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check more patterns for retBuffer. #40340

Merged
merged 2 commits into from
Aug 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/coreclr/scripts/superpmi.py
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,8 @@ def replay(self):
altjit_string = "*" if self.coreclr_args.altjit else ""
altjit_flags = [
"-jitoption", "force", "AltJit=" + altjit_string,
"-jitoption", "force", "AltJitNgen=" + altjit_string
"-jitoption", "force", "AltJitNgen=" + altjit_string,
"-jitoption", "force", "EnableExtraSuperPmiQueries=0"
]
flags += altjit_flags

Expand Down Expand Up @@ -1032,8 +1033,10 @@ def replay_with_asm_diffs(self):
altjit_flags = [
"-jitoption", "force", "AltJit=" + altjit_string,
"-jitoption", "force", "AltJitNgen=" + altjit_string,
"-jitoption", "force", "EnableExtraSuperPmiQueries=0",
"-jit2option", "force", "AltJit=" + altjit_string,
"-jit2option", "force", "AltJitNgen=" + altjit_string
"-jit2option", "force", "AltJitNgen=" + altjit_string,
"-jit2option", "force", "EnableExtraSuperPmiQueries=0"
]
flags += altjit_flags

Expand Down Expand Up @@ -1208,7 +1211,8 @@ def replay_with_asm_diffs(self):
altjit_string = "*" if self.coreclr_args.altjit else ""
altjit_flags = [
"-jitoption", "force", "AltJit=" + altjit_string,
"-jitoption", "force", "AltJitNgen=" + altjit_string
"-jitoption", "force", "AltJitNgen=" + altjit_string,
"-jitoption", "force", "EnableExtraSuperPmiQueries=0"
]

async def create_asm(print_prefix, item, self, text_differences, base_asm_location, diff_asm_location):
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/jit/morph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8946,7 +8946,7 @@ GenTree* Compiler::fgMorphCall(GenTreeCall* call)

GenTree* dest = call->gtCallArgs->GetNode();
assert(dest->OperGet() != GT_ARGPLACE); // If it was, we'd be in a remorph, which we've already excluded above.
if (dest->gtType == TYP_BYREF && !(dest->OperGet() == GT_ADDR && dest->AsOp()->gtOp1->OperGet() == GT_LCL_VAR))
if (dest->TypeIs(TYP_BYREF) && !dest->IsLocalAddrExpr())
{
// We'll exempt helper calls from this, assuming that the helper implementation
// follows the old convention, and does whatever barrier is required.
Expand Down