Fix merge issue

Author: HendrikHuebner

clang/lib/CIR/CodeGen/CIRGenBuiltinX86.cpp

@@ -100,7 +100,7 @@ static mlir::Value emitVectorFCmp(CIRGenBuilderTy &builder,
 }
 
 std::optional<mlir::Value>
-CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID, const CallExpr *e) {
+CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID, const CallExpr *expr) {
   if (builtinID == Builtin::BI__builtin_cpu_is) {
     cgm.errorNYI(expr->getSourceRange(), "__builtin_cpu_is");
     return {};
@@ -153,7 +153,7 @@ CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID, const CallExpr *e) {
   case X86::BI_mm_prefetch:
   case X86::BI_m_prefetch:
   case X86::BI_m_prefetchw:
-    return emitPrefetch(*this, builtinID, e, ops);
+    return emitPrefetch(*this, builtinID, expr, ops);
   case X86::BI__rdtsc:
   case X86::BI__builtin_ia32_rdtscp:
   case X86::BI__builtin_ia32_lzcnt_u16: