scalar type must match vector

Author: spall

clang/lib/Headers/hlsl/hlsl_compat_overloads.h

@@ -58,35 +58,31 @@ clamp(U p0, V p1, W p2) {
 // max builtin overloads
 //===----------------------------------------------------------------------===//
 
-template <typename T, typename U, uint N>
-constexpr __detail::enable_if_t<
-    __detail::is_arithmetic<U>::Value && (N > 1 && N <= 4), vector<T, N>>
-max(vector<T, N> p0, U p1) {
+template <typename T, uint N>
+constexpr __detail::enable_if_t<(N > 1 && N <= 4), vector<T, N>>
+max(vector<T, N> p0, T p1) {
   return max(p0, (vector<T, N>)p1);
 }
 
-template <typename T, typename U, uint N>
-constexpr __detail::enable_if_t<
-    __detail::is_arithmetic<U>::Value && (N > 1 && N <= 4), vector<T, N>>
-max(U p0, vector<T, N> p1) {
+template <typename T, uint N>
+constexpr __detail::enable_if_t<(N > 1 && N <= 4), vector<T, N>>
+max(T p0, vector<T, N> p1) {
   return max((vector<T, N>)p0, p1);
 }
 
 //===----------------------------------------------------------------------===//
 // min builtin overloads
 //===----------------------------------------------------------------------===//
 
-template <typename T, typename U, uint N>
-constexpr __detail::enable_if_t<
-    __detail::is_arithmetic<U>::Value && (N > 1 && N <= 4), vector<T, N>>
-min(vector<T, N> p0, U p1) {
+template <typename T, uint N>
+constexpr __detail::enable_if_t<(N > 1 && N <= 4), vector<T, N>>
+min(vector<T, N> p0, T p1) {
   return min(p0, (vector<T, N>)p1);
 }
 
-template <typename T, typename U, uint N>
-constexpr __detail::enable_if_t<
-    __detail::is_arithmetic<U>::Value && (N > 1 && N <= 4), vector<T, N>>
-min(U p0, vector<T, N> p1) {
+template <typename T, uint N>
+constexpr __detail::enable_if_t<(N > 1 && N <= 4), vector<T, N>>
+min(T p0, vector<T, N> p1) {
   return min((vector<T, N>)p0, p1);
 }
 

clang/test/CodeGenHLSL/builtins/max.hlsl

@@ -163,11 +163,3 @@ double4 test_max_double4_mismatch(double4 p0, double p1) { return max(p0, p1); }
 // CHECK-LABEL: define noundef nofpclass(nan inf) <4 x double> {{.*}}test_max_double4_mismatch2
 // CHECK: call reassoc nnan ninf nsz arcp afn <4 x double> @llvm.maxnum.v4f64
 double4 test_max_double4_mismatch2(double4 p0, double p1) { return max(p1, p0); }
-
-// CHECK-LABEL: define noundef <2 x i32> {{.*}}test_overloads1
-// CHECK: call <2 x i32> @llvm.smax.v2i32
-int2 test_overloads1(int2 p0, float p1) { return max(p0, p1); }
-
-// CHECK-LABEL: define noundef <2 x i32> {{.*}}test_overloads2
-// CHECK: call <2 x i32> @llvm.smax.v2i32
-int2 test_overloads2(int2 p0, float p1) { return max(p1, p0); }

clang/test/CodeGenHLSL/builtins/min.hlsl

@@ -163,11 +163,3 @@ double4 test_min_double4_mismatch(double4 p0, double p1) { return min(p0, p1); }
 // CHECK-LABEL: define noundef nofpclass(nan inf) <4 x double> {{.*}}test_min_double4_mismatch2
 // CHECK: call reassoc nnan ninf nsz arcp afn <4 x double> @llvm.minnum.v4f64
 double4 test_min_double4_mismatch2(double4 p0, double p1) { return min(p1, p0); }
-
-// CHECK-LABEL: define noundef <2 x i32> {{.*}}test_overloads1
-// CHECK: call <2 x i32> @llvm.smin.v2i32
-int2 test_overloads1(int2 p0, float p1) { return min(p0, p1); }
-
-// CHECK-LABEL: define noundef <2 x i32> {{.*}}test_overloads2
-// CHECK: call <2 x i32> @llvm.smin.v2i32
-int2 test_overloads2(int2 p0, float p1) { return min(p1, p0); }