commit 3252177f16cdaff9eafdc970fd7f195593e65096
author Chad Rosier <mcrosier@apple.com> Fri May 27 19:38:10 2011 +0000
committer Chad Rosier <mcrosier@apple.com> Fri May 27 19:38:10 2011 +0000
tree 97b45f2186bb2e946310485f124461466928c415
parent 39e22eae49319c6b638a37b955483f3604371b5f

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.

llvm-svn: 132207

llvm/lib/VMCore/AutoUpgrade.cpp

diff --git a/llvm/lib/VMCore/AutoUpgrade.cpp b/llvm/lib/VMCore/AutoUpgrade.cpp
index b2b3d0b..f8f15ca 100644
--- a/llvm/lib/VMCore/AutoUpgrade.cpp
+++ b/llvm/lib/VMCore/AutoUpgrade.cpp
@@ -290,18 +290,18 @@
     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";
         }
       }