remove problematic overloads

Author: spall

clang/lib/Headers/hlsl/hlsl_compat_overloads.h

@@ -72,12 +72,6 @@ max(U p0, vector<T, N> p1) {
   return max((vector<T, N>)p0, p1);
 }
 
-template <typename T, typename R, uint N>
-constexpr __detail::enable_if_t<(N > 1 && N <= 4), vector<T, N>>
-max(vector<T, N> p0, vector<R, N> p1) {
-  return max(p0, (vector<T, N>)p1);
-}
-
 template <typename U, typename V>
 constexpr __detail::enable_if_t<
     __detail::is_arithmetic<U>::Value && __detail::is_arithmetic<V>::Value, U>
@@ -103,12 +97,6 @@ min(U p0, vector<T, N> p1) {
   return min((vector<T, N>)p0, p1);
 }
 
-template <typename T, typename R, uint N>
-constexpr __detail::enable_if_t<(N > 1 && N <= 4), vector<T, N>>
-min(vector<T, N> p0, vector<R, N> p1) {
-  return min(p0, (vector<T, N>)p1);
-}
-
 template <typename U, typename V>
 constexpr __detail::enable_if_t<
     __detail::is_arithmetic<U>::Value && __detail::is_arithmetic<V>::Value, U>

clang/test/CodeGenHLSL/builtins/max.hlsl

@@ -172,10 +172,6 @@ int2 test_overloads1(int2 p0, float p1) { return max(p0, p1); }
 // CHECK: call <2 x i32> @llvm.smax.v2i32
 int2 test_overloads2(int2 p0, float p1) { return max(p1, p0); }
 
-// CHECK-LABEL: define noundef nofpclass(nan inf) <3 x float> {{.*}}test_overloads3
-// CHECK: call reassoc nnan ninf nsz arcp afn <3 x float> @llvm.maxnum.v3f32
-float3 test_overloads3(float3 p0, int3 p1) { return max(p0, p1); }
-
 // CHECK-LABEL: define noundef nofpclass(nan inf) double {{.*}}test_overloads4
 // CHECK: call reassoc nnan ninf nsz arcp afn double @llvm.maxnum.f64(
 double test_overloads4(double p0, int p1) { return max(p0, p1); }

clang/test/CodeGenHLSL/builtins/min.hlsl

@@ -172,10 +172,6 @@ int2 test_overloads1(int2 p0, float p1) { return min(p0, p1); }
 // CHECK: call <2 x i32> @llvm.smin.v2i32
 int2 test_overloads2(int2 p0, float p1) { return min(p1, p0); }
 
-// CHECK-LABEL: define noundef nofpclass(nan inf) <3 x float> {{.*}}test_overloads3
-// CHECK: call reassoc nnan ninf nsz arcp afn <3 x float> @llvm.minnum.v3f32
-float3 test_overloads3(float3 p0, int3 p1) { return min(p0, p1); }
-
 // CHECK-LABEL: define noundef nofpclass(nan inf) double {{.*}}test_overloads4
 // CHECK: call reassoc nnan ninf nsz arcp afn double @llvm.minnum.f64(
 double test_overloads4(double p0, int p1) { return min(p0, p1); }