Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Backport two Win64 fixes #77

Merged
merged 2 commits into from
May 4, 2017
Merged

Backport two Win64 fixes #77

merged 2 commits into from
May 4, 2017

Conversation

TimNN
Copy link

@TimNN TimNN commented May 4, 2017

r? @alexcrichton

rnk added 2 commits May 4, 2017 06:47
@rnk @TimNN
[WinEH] Adjust decision to emit SEH moves for leaf functions
ea87f9f 
Move the check for "MF->hasWinCFI()" up into the calculation of the
shouldEmitMoves boolean, rather than putting it in the early returning
if. This ensures that endFunction doesn't try to emit .seh_* directives
for leaf functions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298276 91177308-0d34-0410-b5e6-96231b3b80d8
@rnk @TimNN
Mark functions as not having CFI once we finalize an x86 stack frame
508425c 
We'll set it back to true in emitPrologue if it gets called. It doesn't
get called for naked functions.

Fixes PR32912

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@302092 91177308-0d34-0410-b5e6-96231b3b80d8
@alexcrichton
Copy link
Member

Thanks for tracking these down!

@alexcrichton alexcrichton merged commit cf85b5a into rust-lang:rust-llvm-2017-04-13 May 4, 2017
@TimNN TimNN deleted the win64-backports branch May 4, 2017 06:09
arielb1 pushed a commit that referenced this pull request Jun 27, 2017
@alexcrichton @arielb1
Merge pull request #77 from TimNN/win64-backports
e0cff91 
Backport two Win64 fixes
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TimNN @alexcrichton @rnk