Fix bugs

Author: Groverkss

mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp

@@ -1118,17 +1118,14 @@ class VectorExtractOpConversion
     // Since the LLVM type converter converts 0-d vectors to 1-d vectors, we
     // need to add a position for this change.
     if (extractOp.getSourceVectorType().getRank() == 0) {
-      auto idxType = rewriter.getIndexType();
-      Value position = rewriter.create<LLVM::ConstantOp>(
-          loc, typeConverter->convertType(idxType),
-          rewriter.getIntegerAttr(idxType, 0));
-      positionVec.push_back(position);
+      Type idxType = typeConverter->convertType(rewriter.getIndexType());
+      positionVec.push_back(rewriter.getZeroAttr(idxType));
     }
 
     Value extracted = adaptor.getVector();
-    if (extractsScalar) {
+    if (extractsAggregate) {
       ArrayRef<OpFoldResult> position(positionVec);
-      if (extractsAggregate) {
+      if (extractsScalar) {
         // If we are extracting a scalar from the extracted member, we drop
         // the last index, which will be used to extract the scalar out of the
         // vector.

mlir/test/Conversion/VectorToLLVM/vector-to-llvm.mlir

@@ -1344,7 +1344,7 @@ func.func @extract_scalar_from_vec_0d_index(%arg0: vector<index>) -> index {
 // CHECK-LABEL: @extract_scalar_from_vec_0d_index(
 //  CHECK-SAME:   %[[A:.*]]: vector<index>)
 //       CHECK:   %[[T0:.*]] = builtin.unrealized_conversion_cast %[[A]] : vector<index> to vector<1xi64>
-//       CHECK:   %[[T1:.*]] = llvm.mlir.constant(0 : index) : i64
+//       CHECK:   %[[T1:.*]] = llvm.mlir.constant(0 : i64) : i64
 //       CHECK:   %[[T2:.*]] = llvm.extractelement %[[T0]][%[[T1]] : i64] : vector<1xi64>
 //       CHECK:   %[[T3:.*]] = builtin.unrealized_conversion_cast %[[T2]] : i64 to index
 //       CHECK:   return %[[T3]] : index