CRC32 intrinsics were renamed at revision 132163. This submission

fixes aliasing issues with the old and new names as well as adds test
cases for the auto-upgrader.
Fixes rdar 9472944.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@132207 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/VMCore/AutoUpgrade.cpp b/lib/VMCore/AutoUpgrade.cpp
index b2b3d0beb6..f8f15caec9 100644
--- a/lib/VMCore/AutoUpgrade.cpp
+++ b/lib/VMCore/AutoUpgrade.cpp
@@ -290,18 +290,18 @@ static bool UpgradeIntrinsicFunction1(Function *F, Function *&NewFn) {
     if (Name.compare(5, 13, "x86.sse42.crc", 13) == 0) {
       const char* NewFnName = NULL;
       if (Name.compare(18, 2, "32", 2) == 0) {
-        if (Name.compare(20, 2, ".8") == 0) {
+        if (Name.compare(20, 2, ".8") == 0 && Name.length() == 22) {
           NewFnName = "llvm.x86.sse42.crc32.32.8";
-        } else if (Name.compare(20, 2, ".16") == 0) {
+        } else if (Name.compare(20, 3, ".16") == 0 && Name.length() == 23) {
           NewFnName = "llvm.x86.sse42.crc32.32.16";
-        } else if (Name.compare(20, 2, ".32") == 0) {
+        } else if (Name.compare(20, 3, ".32") == 0 && Name.length() == 23) {
           NewFnName = "llvm.x86.sse42.crc32.32.32";
         }
       }
       else if (Name.compare(18, 2, "64", 2) == 0) {
-        if (Name.compare(20, 2, ".8") == 0) {
+        if (Name.compare(20, 2, ".8") == 0 && Name.length() == 22) {
           NewFnName = "llvm.x86.sse42.crc32.64.8";
-        } else if (Name.compare(20, 2, ".64") == 0) {
+        } else if (Name.compare(20, 3, ".64") == 0 && Name.length() == 23) {
           NewFnName = "llvm.x86.sse42.crc32.64.64";
         }
       }