[llvm-branch-commits] [llvm-branch] r353159 - Merging r352945:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Feb  5 03:27:12 2019
New Revision: 353159

URL: http://llvm.org/viewvc/llvm-project?rev=353159&view=rev
Log:
Merging r352945:
------------------------------------------------------------------------
r352945 | mgrang | 2019-02-02 02:32:48 +0100 (Sat, 02 Feb 2019) | 13 lines

[AutoUpgrade] Fix AutoUpgrade for x86.seh.recoverfp

Summary: This fixes the bug in https://reviews.llvm.org/D56747#inline-502711.

Reviewers: efriedma

Reviewed By: efriedma

Subscribers: javed.absar, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D57614
------------------------------------------------------------------------

Added:
    llvm/branches/release_80/test/CodeGen/AArch64/eh_recoverfp.ll
      - copied unchanged from r352945, llvm/trunk/test/CodeGen/AArch64/eh_recoverfp.ll
Modified:
    llvm/branches/release_80/   (props changed)
    llvm/branches/release_80/lib/IR/AutoUpgrade.cpp

Propchange: llvm/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  5 03:27:12 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,351325,351344-351345,351349,351351,351370,351381,351421,351426,351436,351475,351485,351753-351754,351910,351930,351932,352034,352204,352246,352374,352770,352889
+/llvm/trunk:155241,351325,351344-351345,351349,351351,351370,351381,351421,351426,351436,351475,351485,351753-351754,351910,351930,351932,352034,352204,352246,352374,352770,352889,352945

Modified: llvm/branches/release_80/lib/IR/AutoUpgrade.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_80/lib/IR/AutoUpgrade.cpp?rev=353159&r1=353158&r2=353159&view=diff
==============================================================================
--- llvm/branches/release_80/lib/IR/AutoUpgrade.cpp (original)
+++ llvm/branches/release_80/lib/IR/AutoUpgrade.cpp Tue Feb  5 03:27:12 2019
@@ -469,6 +469,11 @@ static bool UpgradeX86IntrinsicFunction(
     }
   }
 
+  if (Name == "seh.recoverfp") {
+    NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::eh_recoverfp);
+    return true;
+  }
+
   return false;
 }
 
@@ -544,10 +549,6 @@ static bool UpgradeIntrinsicFunction1(Fu
       NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::thread_pointer);
       return true;
     }
-    if (Name == "x86.seh.recoverfp") {
-      NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::eh_recoverfp);
-      return true;
-    }
     break;
   }