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.

Sign up for GitHub

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

Jump to bottom

Fix tailCall check for for calli. #39621

Merged
merged 1 commit into from
Jul 21, 2020
Merged

Fix tailCall check for for calli. #39621

merged 1 commit into from
Jul 21, 2020

Conversation

sandreenko
Copy link
Contributor

@sandreenko sandreenko commented Jul 20, 2020 •
edited
Loading

As we can see from

runtime/src/coreclr/src/jit/importer.cpp

Line 7641 in f4e9146

else // (opcode != CEE_CALLI)

runtime/src/coreclr/src/jit/importer.cpp

Lines 7653 to 7655 in f4e9146

sig = &(callInfo->sig);
callRetTyp = JITtype2varType(sig->retType);

in impImportCall the correct signature is saved in sig. callInfo->sig is correct for !CEE_CALLI, calliSig is used for CEE_CALLI.

Fixes #39556 (It fixes new 2 failures out of 34, but the other are expected InvalidProgramException).

@sandreenko sandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jul 20, 2020
@sandreenko
Copy link
Contributor Author

PTAL @dotnet/jit-contrib

@jaredpar jaredpar mentioned this pull request Jul 20, 2020
Closed
@erozenfeld
Copy link
Member

Looks good but I think you have it backwards in the title and the description: this fixes calli case, not !calli.

@sandreenko sandreenko changed the title Fix tailCall check for for !calli. Fix tailCall check for for calli. Jul 20, 2020
@sandreenko
Copy link
Contributor Author

Looks good but I think you have it backwards in the title and the description: this fixes calli case, not !calli.

You are right, thanks.

erozenfeld
erozenfeld approved these changes Jul 20, 2020
View reviewed changes
Copy link
Member

@erozenfeld erozenfeld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sandreenko sandreenko merged commit c399806 into dotnet:master Jul 21, 2020
@sandreenko sandreenko deleted the fixTailCallCheck branch July 21, 2020 06:12
Jacksondr5 pushed a commit to Jacksondr5/runtime that referenced this pull request Aug 10, 2020
@Jacksondr5
Fix tailCall check for CallI. (dotnet#39621)
1bd9e88
@karelz karelz added this to the 5.0.0 milestone Aug 18, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Dec 8, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@erozenfeld erozenfeld erozenfeld approved these changes

Assignees
No one assigned
Labels
area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
Projects
None yet
Milestone
5.0.0
Development

Successfully merging this pull request may close these issues.

Pmi run on some test dll-s hits some jit asserts.
3 participants
@sandreenko @erozenfeld @karelz