rebase, use auto for variable holding an explicit cast

Author: moar55

clang/lib/CIR/CodeGen/CIRGenBuiltinX86.cpp

@@ -104,7 +104,7 @@ static mlir::Value emitX86FunnelShift(CIRGenFunction &cgf, const CallExpr *e,
     auto vecTy = mlir::cast<cir::VectorType>(ty);
 
     auto numElems = vecTy.getSize();
-    cir::IntType vecElemType = mlir::cast<cir::IntType>(vecTy.getElementType());
+    auto vecElemType = mlir::cast<cir::IntType>(vecTy.getElementType());
     auto signlessType =
         cir::IntType::get(&cgf.getMLIRContext(), vecElemType.getWidth(), false);
     amt = cgf.getBuilder().createIntCast(amt, signlessType);
@@ -680,11 +680,6 @@ mlir::Value CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID,
         builder.createVecShuffle(getLoc(expr->getExprLoc()), in, zero, indices);
     return builder.createBitcast(sv, ops[0].getType());
   }
-  case X86::BI__builtin_ia32_kshiftridi:
-    cgm.errorNYI(expr->getSourceRange(),
-                 std::string("unimplemented X86 builtin call: ") +
-                     getContext().BuiltinInfo.getName(builtinID));
-    return {};
   case X86::BI__builtin_ia32_vprotbi:
   case X86::BI__builtin_ia32_vprotwi:
   case X86::BI__builtin_ia32_vprotdi: