Build UserData c++17 compatible

Author: tomnatan30

.github/CODEOWNERS

@@ -116,8 +116,8 @@ clang/test/AST/Interp/ @tbaederr
 /mlir/**/NVVM* @grypp
 
 # MLIR Python Bindings
-/mlir/test/python/ @makslevental @stellaraccident
-/mlir/python/ @makslevental @stellaraccident
+/mlir/test/python/ @ftynse @makslevental @stellaraccident
+/mlir/python/ @ftynse @makslevental @stellaraccident
 
 # BOLT
 /bolt/ @aaupov @maksfb @rafaelauler @ayermolo @dcci

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

@@ -24478,7 +24478,8 @@ SDValue DAGCombiner::visitEXTRACT_SUBVECTOR(SDNode *N) {
     unsigned NumSubElts = NVT.getVectorMinNumElements();
     if (InsIdx <= ExtIdx && (ExtIdx + NumSubElts) <= (InsIdx + NumInsElts) &&
         TLI.isExtractSubvectorCheap(NVT, InsSubVT, ExtIdx - InsIdx) &&
-        InsSubVT.isFixedLengthVector() && NVT.isFixedLengthVector())
+        InsSubVT.isFixedLengthVector() && NVT.isFixedLengthVector() &&
+        V.getValueType().isFixedLengthVector())
       return DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, NVT, InsSub,
                          DAG.getVectorIdxConstant(ExtIdx - InsIdx, DL));
   }

llvm/test/CodeGen/AArch64/sve-fixed-length-extract-subvector.ll

@@ -613,6 +613,40 @@ define void @extract_subvector_v32f64(ptr %a, ptr %b) vscale_range(16,0) #0 {
   ret void
 }
 
+; Test for infinite loop due to fold:
+; extract_subvector(insert_subvector(x,y,c1),c2)--> extract_subvector(y,c2-c1)
+define void @extract_subvector_legalization_v8i32() vscale_range(2,2) #0 {
+; CHECK-LABEL: extract_subvector_legalization_v8i32:
+; CHECK:       // %bb.0: // %entry
+; CHECK-NEXT:    ptrue p0.s
+; CHECK-NEXT:    adrp x8, .LCPI40_0
+; CHECK-NEXT:    add x8, x8, :lo12:.LCPI40_0
+; CHECK-NEXT:    movi v2.2d, #0000000000000000
+; CHECK-NEXT:    ptrue p1.d
+; CHECK-NEXT:    ld1w { z0.s }, p0/z, [x8]
+; CHECK-NEXT:    mov z1.d, z0.d
+; CHECK-NEXT:    ext z1.b, z1.b, z0.b, #16
+; CHECK-NEXT:    cmeq v0.4s, v0.4s, v2.4s
+; CHECK-NEXT:    cmeq v1.4s, v1.4s, v2.4s
+; CHECK-NEXT:    sunpklo z0.d, z0.s
+; CHECK-NEXT:    sunpklo z1.d, z1.s
+; CHECK-NEXT:    cmpne p0.d, p1/z, z1.d, #0
+; CHECK-NEXT:    cmpne p1.d, p1/z, z0.d, #0
+; CHECK-NEXT:  .LBB40_1: // %body
+; CHECK-NEXT:    // =>This Inner Loop Header: Depth=1
+; CHECK-NEXT:    st1d { z0.d }, p1, [x8]
+; CHECK-NEXT:    st1d { z0.d }, p0, [x8]
+; CHECK-NEXT:    b .LBB40_1
+entry:
+  %splat = shufflevector <8 x i32> poison, <8 x i32> poison, <8 x i32> zeroinitializer
+  br label %body
+body:
+  %0 = icmp eq <8 x i32> zeroinitializer, %splat
+  tail call void @llvm.masked.store.v8f64.p0(<8 x double> poison, ptr poison, i32 8, <8 x i1> %0)
+  br label %body
+}
+declare void @llvm.masked.store.v8f64.p0(<8 x double>, ptr nocapture, i32 immarg, <8 x i1>)
+
 declare <4 x i8> @llvm.vector.extract.v4i8.v8i8(<8 x i8>, i64)
 declare <8 x i8> @llvm.vector.extract.v8i8.v16i8(<16 x i8>, i64)
 declare <16 x i8> @llvm.vector.extract.v16i8.v32i8(<32 x i8>, i64)

llvm/utils/gn/secondary/libcxx/include/BUILD.gn

@@ -143,14 +143,6 @@ if (current_toolchain == default_toolchain) {
       "__algorithm/pop_heap.h",
       "__algorithm/prev_permutation.h",
       "__algorithm/pstl_any_all_none_of.h",
-      "__algorithm/pstl_backends/cpu_backends/any_of.h",
-      "__algorithm/pstl_backends/cpu_backends/fill.h",
-      "__algorithm/pstl_backends/cpu_backends/find_if.h",
-      "__algorithm/pstl_backends/cpu_backends/for_each.h",
-      "__algorithm/pstl_backends/cpu_backends/merge.h",
-      "__algorithm/pstl_backends/cpu_backends/stable_sort.h",
-      "__algorithm/pstl_backends/cpu_backends/transform.h",
-      "__algorithm/pstl_backends/cpu_backends/transform_reduce.h",
       "__algorithm/pstl_copy.h",
       "__algorithm/pstl_count.h",
       "__algorithm/pstl_equal.h",
@@ -663,7 +655,15 @@ if (current_toolchain == default_toolchain) {
       "__pstl/backends/std_thread.h",
       "__pstl/configuration.h",
       "__pstl/configuration_fwd.h",
+      "__pstl/cpu_algos/any_of.h",
       "__pstl/cpu_algos/cpu_traits.h",
+      "__pstl/cpu_algos/fill.h",
+      "__pstl/cpu_algos/find_if.h",
+      "__pstl/cpu_algos/for_each.h",
+      "__pstl/cpu_algos/merge.h",
+      "__pstl/cpu_algos/stable_sort.h",
+      "__pstl/cpu_algos/transform.h",
+      "__pstl/cpu_algos/transform_reduce.h",
       "__random/bernoulli_distribution.h",
       "__random/binomial_distribution.h",
       "__random/cauchy_distribution.h",

mlir/lib/Bindings/Python/IRCore.cpp

@@ -1261,7 +1261,7 @@ void PyOperationBase::walk(
     std::string exceptionWhat;
     py::object exceptionType;
   };
-  UserData userData{.callback = callback};
+  UserData userData{callback, false, {}, {}};
   MlirOperationWalkCallback walkCallback = [](MlirOperation op,
                                               void *userData) {
     UserData *calleeUserData = static_cast<UserData *>(userData);