Fixup

Author: kuhar

clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp

@@ -227,7 +227,7 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> {
       const mlir::Location loc = cgf.getLoc(e->getSourceRange());
       const mlir::Value vecValue = Visit(e->getBase());
       const mlir::Value indexValue = Visit(e->getIdx());
-      return cgf.cir::VecExtractOp::create(builder, loc, vecValue, indexValue);
+      return VecExtractOp::create(cgf.cir.builder, loc, vecValue, indexValue);
     }
     // Just load the lvalue formed by the subscript expression.
     return emitLoadOfLValue(e);
@@ -238,8 +238,8 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> {
       // The undocumented form of __builtin_shufflevector.
       mlir::Value inputVec = Visit(e->getExpr(0));
       mlir::Value indexVec = Visit(e->getExpr(1));
-      return cgf.cir::VecShuffleDynamicOp::create(
-          builder, cgf.getLoc(e->getSourceRange()), inputVec, indexVec);
+      return VecShuffleDynamicOp::create(
+          cgf.cir.builder, cgf.getLoc(e->getSourceRange()), inputVec, indexVec);
     }
 
     mlir::Value vec1 = Visit(e->getExpr(0));
@@ -257,9 +257,10 @@ class ScalarExprEmitter : public StmtVisitor<ScalarExprEmitter, mlir::Value> {
                                 .getSExtValue()));
     }
 
-    return cgf.cir::VecShuffleOp::create(
-        builder, cgf.getLoc(e->getSourceRange()), cgf.convertType(e->getType()),
-        vec1, vec2, cgf.builder.getArrayAttr(indices));
+    return VecShuffleOp::create(cgf.cir.builder,
+                                cgf.getLoc(e->getSourceRange()),
+                                cgf.convertType(e->getType()), vec1, vec2,
+                                cgf.builder.getArrayAttr(indices));
   }
 
   mlir::Value VisitConvertVectorExpr(ConvertVectorExpr *e) {

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

@@ -2428,14 +2428,14 @@ mlir::LogicalResult CIRToLLVMCmpOpLowering::matchAndRewrite(
     mlir::Type complexElemTy =
         getTypeConverter()->convertType(complexType.getElementType());
 
-    auto lhsReal = mlir::LLVM::ExtractValueOp::create(rewriter, loc,
-                                                      complexElemTy, lhs, 0);
-    auto lhsImag = mlir::LLVM::ExtractValueOp::create(rewriter, loc,
-                                                      complexElemTy, lhs, 1);
-    auto rhsReal = mlir::LLVM::ExtractValueOp::create(rewriter, loc,
-                                                      complexElemTy, rhs, 0);
-    auto rhsImag = mlir::LLVM::ExtractValueOp::create(rewriter, loc,
-                                                      complexElemTy, rhs, 1);
+    auto lhsReal = mlir::LLVM::ExtractValueOp::create(
+        rewriter, loc, complexElemTy, lhs, int64_t{0});
+    auto lhsImag = mlir::LLVM::ExtractValueOp::create(
+        rewriter, loc, complexElemTy, lhs, int64_t{1});
+    auto rhsReal = mlir::LLVM::ExtractValueOp::create(
+        rewriter, loc, complexElemTy, rhs, int64_t{0});
+    auto rhsImag = mlir::LLVM::ExtractValueOp::create(
+        rewriter, loc, complexElemTy, rhs, int64_t{1});
 
     if (cmpOp.getKind() == cir::CmpOpKind::eq) {
       if (complexElemTy.isInteger()) {