remove more problematic overloads

Author: spall

clang/lib/Headers/hlsl/hlsl_compat_overloads.h

@@ -72,13 +72,6 @@ max(U p0, vector<T, N> p1) {
   return max((vector<T, N>)p0, p1);
 }
 
-template <typename U, typename V>
-constexpr __detail::enable_if_t<
-    __detail::is_arithmetic<U>::Value && __detail::is_arithmetic<V>::Value, U>
-max(U p0, V p1) {
-  return max(p0, (U)p1);
-}
-
 //===----------------------------------------------------------------------===//
 // min builtin overloads
 //===----------------------------------------------------------------------===//
@@ -97,12 +90,5 @@ min(U p0, vector<T, N> p1) {
   return min((vector<T, N>)p0, p1);
 }
 
-template <typename U, typename V>
-constexpr __detail::enable_if_t<
-    __detail::is_arithmetic<U>::Value && __detail::is_arithmetic<V>::Value, U>
-min(U p0, V p1) {
-  return min(p0, (U)p1);
-}
-
 } // namespace hlsl
 #endif // _HLSL_COMPAT_OVERLOADS_H_

clang/test/CodeGenHLSL/builtins/max.hlsl

@@ -171,7 +171,3 @@ 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); }
-
-// 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

@@ -171,7 +171,3 @@ 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); }
-
-// 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); }