Revert my patch changing the MMX "shift" intrinsics that take immediates into

"shift with non-immediate" intrinsics. It gets here because we they aren't
immediates anymore.

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

diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index 9e7510461b6a6f3627c810102ad82b5245f1fa9f..443b7c089f56f85dca282fcb1915594bb2321dfb 100644 (file)
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -1952,35 +1952,35 @@ Value *CodeGenFunction::EmitX86BuiltinExpr(unsigned BuiltinID,
     default: assert(0 && "Unsupported shift intrinsic!");
     case X86::BI__builtin_ia32_pslldi:
       name = "pslldi";
-      ID = Intrinsic::x86_mmx_pslli_d;
+      ID = Intrinsic::x86_mmx_psll_d;
       break;
     case X86::BI__builtin_ia32_psllqi:
       name = "psllqi";
-      ID = Intrinsic::x86_mmx_pslli_q;
+      ID = Intrinsic::x86_mmx_psll_q;
       break;
     case X86::BI__builtin_ia32_psllwi:
       name = "psllwi";
-      ID = Intrinsic::x86_mmx_pslli_w;
+      ID = Intrinsic::x86_mmx_psll_w;
       break;
     case X86::BI__builtin_ia32_psradi:
       name = "psradi";
-      ID = Intrinsic::x86_mmx_psrai_d;
+      ID = Intrinsic::x86_mmx_psra_d;
       break;
     case X86::BI__builtin_ia32_psrawi:
       name = "psrawi";
-      ID = Intrinsic::x86_mmx_psrai_w;
+      ID = Intrinsic::x86_mmx_psra_w;
       break;
     case X86::BI__builtin_ia32_psrldi:
       name = "psrldi";
-      ID = Intrinsic::x86_mmx_psrli_d;
+      ID = Intrinsic::x86_mmx_psrl_d;
       break;
     case X86::BI__builtin_ia32_psrlqi:
       name = "psrlqi";
-      ID = Intrinsic::x86_mmx_psrli_q;
+      ID = Intrinsic::x86_mmx_psrl_q;
       break;
     case X86::BI__builtin_ia32_psrlwi:
       name = "psrlwi";
-      ID = Intrinsic::x86_mmx_psrli_w;
+      ID = Intrinsic::x86_mmx_psrl_w;
       break;
     }
     llvm::Function *F = CGM.getIntrinsic(ID);